tree 936c9a03aafbf9baec2636890462f36f4ed548d9
parent 0f94e5c0b6cc648e4f97ec6963a8f3f35ca4a14a
parent 0ce0b54a0e1251c1ebfbf2dbe586e2afc825be7f
author Victor Khimenko <khim@google.com> 1488369292 +0000
committer android-build-merger <android-build-merger@google.com> 1488369292 +0000

Merge "Stop using __system_property_area__" am: 90c12683ee
am: 0ce0b54a0e

Change-Id: I01b9d03383c733bca41d508a5304c6f38d5d892f