Commit 2f76830a authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 146d79c2: am fbec57d4: Merge changes Ib496e818,I074204e9 

* commit '146d79c2':
  bionic: add compatibility mode for properties
  bionic: use the size of the file to determine property area size
parents 9145ae66 146d79c2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment