Merge "Revert "init: split property context into platform & non-platform components"" am: 8e81cd6609

am: 469e51ac4f

Change-Id: I55d518fcea1d0404912dfd8a4e34deb619f21110
This commit is contained in:
Jorim Jaggi 2017-01-18 16:49:37 +00:00 committed by android-build-merger
commit 70a1f375c8

Diff Content Not Available