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