summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2020-10-07 08:32:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-07 08:32:52 +0000
commit4c94806e28cc6cad5c01563f6dfb81d0f485a411 (patch)
treee94e8dd584d4be522443c92bfee94be12884e78b /tools/aapt2/java/JavaClassGenerator.cpp
parent79148d590a0eb93415f3d62612ff6dd37efd6b98 (diff)
parent5c2b86fbed6970b4047d82656ea279458104df39 (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: 5c2b86fbed -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: Id637abc5705e488e2bc77122e052b9d3ea475ae3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions