tree 6e2fa18d0769dc02ad18ca905a35e0cc494b6d10
parent 7e53b789465c11e187406e23f3d2d94020ad5d50
parent 3d92e370f59c224aea8c47d39609d3addc10c099
author David Su <dysu@google.com> 1602024073 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602024073 +0000

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -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: I262bad1ed18fccf08bc40de1878fb5c6785ebad3