[automerger skipped] Merge "Allow Trusty storageproxy property" am: 76089fcd5f
am: 217490dd40
-s ours am: 707e529cfe
-s ours
am skip reason: Merged-In If995d35be490fbca6c99ef9f73f2842f5c488bd4 with SHA-1 502c76f22b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2310384
Change-Id: I1bf9dd4c3776df950f0aa1e668d8be86cbb2eebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
a7a02c6f68