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)
commit07e74ea1983da67d78804814d2a897ab55a870f8
tree0c91528205e6b9ae992cde6b52770f696d2a065d
parentabea8788e8432d8cf69989058dca0176c7e8503d
parente6a17b4bafa8df7452a81cdb01f23fb0908589b0
Merge "Revert "property_contexts: split into platform and non-platform components"" am: dbfa1bd292
am: e6a17b4baf

Change-Id: I3124b8b82cf42f116322082d53462863a97cca09