diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-03-25 13:08:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-25 13:08:16 +0000 |
| commit | 9326ba611590c2db57d86556c26f35fd47f41bd6 (patch) | |
| tree | d471fdb0b649005fd012afaded7c71635987eb0b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 32aca8849a971e09fc9dbed640e120754f624780 (diff) | |
| parent | c9dddc84c09ecdf4d7de17eafd3547b013dc4367 (diff) | |
[automerger skipped] Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f74 am: e3d28b9ad0 am: c9dddc84c0 -s ours
am skip reason: skip tag Change-Id Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa with SHA-1 ae04f625fe is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939
Change-Id: Ib7ed1d9c595b30fadf6efee2ab2614197e156ce1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions