diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 06:56:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:56:22 +0000 |
commit | 42463d782a305757ced25bf64488e68fab5e5539 (patch) | |
tree | 91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5db80c078aacb2afedce00f6dc0a7d001b7309a3 (diff) | |
parent | 39ff4d21674a92bba239393e759cfdfb26c4323f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e5e8ecad1 -s ours am: cc6a658fe4 -s ours am: 39ff4d2167 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860338
Change-Id: Ia42bf876454af74b6b41c2d0ffd2d3259a3344f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions