diff options
| author | Xin Li <delphij@google.com> | 2020-08-06 17:06:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 17:06:29 +0000 |
| commit | 8ee6ebe466b6cfa5e6641b015caa461ab40e4d31 (patch) | |
| tree | 2f2d877c930baa622f253baae850c37b282400af /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6fd5ba3a44d738f952de95b16180c7d3eb6e0fe7 (diff) | |
| parent | cb56a147ef2bebad1e0ee51fde9ab3b862538770 (diff) | |
[automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e75f am: 4939ba29f5 -s ours am: 955e04a8ee -s ours am: 7f35d6cc41 -s ours am: cb56a147ef -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1387434
Change-Id: Ide09e61479286141f9388fe4f184759563d57fb5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions