OSDN Git Service

Merge "Revert "property_contexts: split into platform and non-platform components...
authorJorim Jaggi <jjaggi@google.com>
Wed, 18 Jan 2017 18:21:46 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 18:21:46 +0000 (18:21 +0000)
am: 07e74ea198

Change-Id: Ib9a5a94c95f24cbf36aa25ad297b48f3643a8fbe


Trivial merge