diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:58:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:58:16 +0000 |
commit | 0dcc613a0ff6f29a26a501491bb979c042d38ade (patch) | |
tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | de58902b7a14df71981be57e2a00fd8eb644190e (diff) | |
parent | 22bca9c10b2532884dc12ed15796d650e717b111 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours am: 336114b4b7 -s ours am: 22bca9c10b -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519350
Change-Id: I2b33d67c968eedc5c3b7b7a268b875c80d7a2b57
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions