OSDN Git Service

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

Change-Id: I023ee1f9c879287b7e40d9af2f0c7a948bd8c251


Trivial merge