[automerger skipped] Allow Trusty storageproxy property am: f70e73af58
-s ours am: bccd56c75d
-s ours
am skip reason: Merged-In I0b4f80371385bf0ddb0c44e81b1893bb80c7a63d with SHA-1 37b0c417d1
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201-sepolicy/+/2322222
Change-Id: I858aeb5dad0841901b4d62e182ca2bfdfa78fd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e639ffcadb