[automerger skipped] Merge "Allow Trusty storageproxy property" am: e1a152fc98
-s ours am: 910018de64
-s ours am: cf39192e37
-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: Id8e2a021692a38278f8127687e4bcde25965aca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
2925d6e2d2