diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:24:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:24:16 +0000 |
commit | ebe36826e7f78b4293282990df2145c535e30f64 (patch) | |
tree | f6e26618ccadc5bd488d26de9acced7fa9f4f97e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f4e9454fd0327144a7751a43d912bb683a00540e (diff) | |
parent | 93af0d6a7b615aedfb730818f2bc9b3f117df03a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 776cb394b6 -s ours am: 766a6861ca -s ours am: 3743d49239 -s ours am: 93af0d6a7b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894373
Change-Id: I612239b6460514aad369753dde3ed4f347d56fbb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions