Merge "Revert "property_context: split into platform and non-platform components.""
am: 615b60bd54
Change-Id: I9c40920a46636128418fac32d8c1872c772b8028
This commit is contained in:
commit
d28e04333d
am: 615b60bd54
Change-Id: I9c40920a46636128418fac32d8c1872c772b8028