diff options
| author | Mark Chien <markchien@google.com> | 2020-06-20 04:32:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 04:32:35 +0000 |
| commit | 798f6db98cc257fd356ae901d5440905b2f8b5d1 (patch) | |
| tree | f880b661e05234d0ad75b88324d81df41b58e285 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e37ca4b0bc87c197e718892b8196500600296fb5 (diff) | |
| parent | 932375528d8fd341421e9ab3da4446589c7a7657 (diff) | |
[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -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: Ie251a5e4cbfc78f8b26ae32a12679dd08bd348d9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions