tree 3323c8fa126fc0bd4cedc3a367d48ce2870b8495
parent 74a162c7b9cb3e6eaaed71bc555e2c9a19b92e2e
parent 81e1bdcb6f84d0d3c69d583ecffffd0cd244d835
author David Su <dysu@google.com> 1602064030 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602064030 +0000

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: I31474e5b0a894300ea0dc5fa18c87bdf2f8d1f18