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

am: d4faa3ce Change-Id: I1791a5758eae1907dc0f15c2eeba36a0ad6577ce

Merge "DO NOT MERGE. Restore property to match oc-dev." into oc-dr1-dev
am: d4faa3ce Change-Id: I1791a5758eae1907dc0f15c2eeba36a0ad6577ce
dbd2b320 · Dan Cashman · android-build-merger · 3b2bf73d · d4faa3ce · dbd2b320
Commit dbd2b320 authored 7 years ago by Dan Cashman Committed by android-build-merger 7 years ago
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -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