diff options
| author | Patrick Baumann <patb@google.com> | 2021-03-03 20:23:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 20:23:08 +0000 |
| commit | 3b9ec373ea2da4da50743678872560f349bcd7f3 (patch) | |
| tree | b14f9a8035af8bfde1139f002cab9a25ddea1a37 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 306b326b6ef58c16bb9dfa2271a05390127a06fd (diff) | |
| parent | dd053819f3af6e9024e21806664bad498795c209 (diff) | |
[automerger skipped] Merge "Parcel queriesProviders in ParsingPackageImpl" am: 8ee2b99d71 am: 131084c94a -s ours am: dd053819f3 -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: I897f66de3b74fca9ddd72da2b52f03f8c86db354
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions