diff options
| author | Anton Hansson <hansson@google.com> | 2021-04-13 15:25:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 15:25:05 +0000 |
| commit | 2e139344029fbcd98c0f43db2807d08825babeb8 (patch) | |
| tree | e43d8b9e0e1f7810e27630ebb49a715d28bd184b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 78f4166e021545efaf12879f468cfb505e6f2044 (diff) | |
| parent | ceebf83ddbe888cb620d32b4c7225fae5b980856 (diff) | |
[automerger skipped] Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361 am: ceebf83ddb -s ours
am skip reason: skip tag Change-Id I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd with SHA-1 31fb58bd22 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673390
Change-Id: I8b6efdc5ef92dbb8bd312433d6cacb2a01bc7706
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions