diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-20 00:50:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 00:50:45 +0000 |
| commit | dc7aca155caf487c4adb9846231e76e203cd524a (patch) | |
| tree | d825b3e7164815a3de536092408a6f0e51ecaea9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 58bb89bb25548f821c2b4b25e02f659a65fea029 (diff) | |
| parent | 84e0e7b3fb3d2634f9a90b079bf5c38a4936b559 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f1fa550975 -s ours am: ad426ee3f8 -s ours am: 84e0e7b3fb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12409744
Change-Id: I72c0de17f4e8dbd4791c520203a4b4fd2113687a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions