OSDN Git Service

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

Change-Id: I7279216d6987fa853ee759997e2c571fc01ce5ed


Trivial merge