Merge "Revert "property_context: split into platform and non-platform components.""

am: 615b60bd54

Change-Id: I9c40920a46636128418fac32d8c1872c772b8028
This commit is contained in:
Jorim Jaggi 2017-01-18 16:45:31 +00:00 committed by android-build-merger
commit d28e04333d

Diff content is not available