tree 01b8ddfdad7e89df05d6bc080c7e8aaa7f6a361b
parent 7e24456d178453682edcb805e8527bec7b935dad
parent 8a936e088dd15c39e85f9a18c368b8ed56fdfdc8
author David Su <dysu@google.com> 1602026452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602026452 +0000

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