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
This commit is contained in:
Colin Cross 2013-06-25 18:29:14 -07:00 committed by Android Git Automerger
commit 2f76830a01

Diff Content Not Available