tree 8d2ce6bfd321366c9a07fe2a2a9782a54eaaf306
parent 5d67607771a0977a3ddad5e31f12c0b12b6348ff
parent 3c8124a2428aaab9ad3af6a16ac45d3572158bf4
author David Su <dysu@google.com> 1602033704 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602033704 +0000

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours am: 79148d590a -s ours am: 3c8124a242 -s ours

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

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

Change-Id: I2e194f584a5dab5be0af93662ea2ee61572a41eb