Merge "DO NOT MERGE. Restore property to match oc-dev." into oc-dr1-dev

am: d4faa3ced0

Change-Id: I1791a5758eae1907dc0f15c2eeba36a0ad6577ce
This commit is contained in:
Dan Cashman 2017-06-16 20:53:02 +00:00 committed by android-build-merger
commit dbd2b320ce

View file

@ -112,3 +112,6 @@ wlan. u:object_r:wifi_prop:s0
# hwservicemanager properties
hwservicemanager. u:object_r:hwservicemanager_prop:s0
# ASAN install trigger
asan.restore_reboot u:object_r:asan_reboot_prop:s0