am fbec57d4: Merge changes Ib496e818,I074204e9

* commit 'fbec57d46c42460b2381484d1610ff21922d162e':
  bionic: add compatibility mode for properties
  bionic: use the size of the file to determine property area size
This commit is contained in:
Colin Cross
2013-06-25 17:08:48 -07:00
committed by Android Git Automerger
4 changed files with 174 additions and 9 deletions

View File

@@ -149,6 +149,7 @@ libc_common_src_files := \
bionic/strntoumax.c \
bionic/strtotimeval.c \
bionic/system_properties.c \
bionic/system_properties_compat.c \
bionic/tcgetpgrp.c \
bionic/tcsetpgrp.c \
bionic/thread_atexit.c \