diff options
| author | Patrick Baumann <patb@google.com> | 2021-03-03 19:05:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 19:05:44 +0000 |
| commit | dd053819f3af6e9024e21806664bad498795c209 (patch) | |
| tree | a4399d76489c7d394f4efbabe91e8d994e6c24ce /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f69232e88b4762a97bc7a8b842540f6bb929affc (diff) | |
| parent | 131084c94a5f4c196e928c57c81b6870c7ea37ea (diff) | |
[automerger skipped] Merge "Parcel queriesProviders in ParsingPackageImpl" am: 8ee2b99d71 am: 131084c94a -s ours
am skip reason: Change-Id I67219fe00c7b92677391fd46305bf0424d74e5f3 with SHA-1 985d71551d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5b39761b4cc597e9b80ff7c6f3955d8241ca1ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions