diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 17:09:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 17:09:20 +0000 |
| commit | 5527cc972b37db974c6e1c2853a389dd124945e2 (patch) | |
| tree | 6a7eb5783e9358ba75a448b66faa50e246fe4bb2 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f80ac25cda8c60ebb428cbe495cdd39b71eaa715 (diff) | |
| parent | 74be92e3f79efe3ed89e712d551eb0fa3ae1273e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 24804d2a8f -s ours am: b2bfea9f6a -s ours am: 4f4c41dac1 -s ours am: 74be92e3f7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11969480
Change-Id: I7d69f21fbd39238c7c05bcf255cbb3e6708470a5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions