diff options
author | David Su <dysu@google.com> | 2020-10-07 08:16:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 08:16:39 +0000 |
commit | 5c2b86fbed6970b4047d82656ea279458104df39 (patch) | |
tree | 01b8ddfdad7e89df05d6bc080c7e8aaa7f6a361b /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b9edc63f80fce727fdb7eaa644587befa63ee384 (diff) | |
parent | aeac5e7d3053c1bb8d6d8ac0fa5a5da1da273683 (diff) |
[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 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: Ic97189261040a3eef447064ceed038727fb11120
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions