diff options
| author | David Su <dysu@google.com> | 2020-10-06 23:37:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-06 23:37:16 +0000 |
| commit | 79148d590a0eb93415f3d62612ff6dd37efd6b98 (patch) | |
| tree | e94e8dd584d4be522443c92bfee94be12884e78b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c201373d98cf7407e5f8046223c4c2185d0b7d5c (diff) | |
| parent | b9edc63f80fce727fdb7eaa644587befa63ee384 (diff) | |
[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 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: Iafd009c9fb724e499a10a071fddec997a322de76
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions