diff options
| author | Mark Chien <markchien@google.com> | 2020-06-20 04:58:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 04:58:44 +0000 |
| commit | 48e3604504ea8ff4799acee125c9cca7cc62edfc (patch) | |
| tree | 5538a70d1b4f0bae39019e39674fd07e739c464a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fc90a690d8eaefa773dbe2500f51778ff0ffc2ac (diff) | |
| parent | d9572716d8d2edba4e4a6872150e8b1dd4b962fd (diff) | |
[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: 798f6db98c -s ours am: d9572716d8 -s ours
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 0ed433e4cd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345357
Change-Id: I05bbffec3b2ae92a254c5f66ad90b5dd85babb5b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions