OSDN Git Service

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

Change-Id: I3124b8b82cf42f116322082d53462863a97cca09


Trivial merge