diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-13 23:01:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:01:43 +0000 |
| commit | 403f941afb7dcfb1770bca610f92d24bff4cee89 (patch) | |
| tree | 57b4c91f2c76701199848e2aa58704855b085409 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6dcacb9ba2383ceae30fac18a420fad6178b308c (diff) | |
| parent | 2e0c1a0555c0a663736b3b22e446dc062893387f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543339
Change-Id: I91d987a7a9f2753e8e51fb1ba69588e01fe3de47
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions