diff options
| author | Xin Li <delphij@google.com> | 2020-08-06 16:48:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 16:48:26 +0000 |
| commit | cb56a147ef2bebad1e0ee51fde9ab3b862538770 (patch) | |
| tree | b36a7ff413b20ab28d38e33542872c01718fa439 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fcc9e753e7341bbb45e533a873595ceaf8a5ed7b (diff) | |
| parent | 7f35d6cc4131e7af762f227f95e753d8f69db155 (diff) | |
[automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e75f am: 4939ba29f5 -s ours am: 955e04a8ee -s ours am: 7f35d6cc41 -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: I3b216c05edfa0cca636019b5aaa8b1aa7572b274
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions