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