tree cd1840f1fdb4e0d168126ff0068321f73f8caf87
parent b909e2c1aa4021f5c3e744a0a4f30ca5071a5c39
parent ce0bae2f470373131f2d5f9d79838c2340f0ba0e
author Jorim Jaggi <jjaggi@google.com> 1484757720 +0000
committer android-build-merger <android-build-merger@google.com> 1484757720 +0000

Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
am: ce0bae2f47

Change-Id: I230c5966278be38339fd369075be30320d27bcd2