OSDN Git Service

am 146d79c2: am fbec57d4: Merge changes Ib496e818,I074204e9
authorColin Cross <ccross@android.com>
Wed, 26 Jun 2013 01:29:14 +0000 (18:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 01:29:14 +0000 (18:29 -0700)
commit2f76830a01be618d3199a6965bc24f1fcb9bbcb4
treedae7b365a2f14e3c7741b72ec87de848fd11cdd8
parent9145ae66d7db80dc5f4a8b95ffe788b6080c206f
parent146d79c22a70d772defc63acfa6ac6128102a15f
am 146d79c2: am fbec57d4: Merge changes Ib496e818,I074204e9

* commit '146d79c22a70d772defc63acfa6ac6128102a15f':
  bionic: add compatibility mode for properties
  bionic: use the size of the file to determine property area size