diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 00:41:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 00:41:26 +0000 |
commit | 8305e43d659594bb26b02e3865f2e7502811d844 (patch) | |
tree | 1bbbf12a138f2b94162ffc5c96051635f146cfb5 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b733cdb7883ca37a5cb9d320041647ae0ebd6e2a (diff) | |
parent | 1d1b1c5f15a58219c028cf3b59eee9a1b9436e05 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8858a01373 -s ours am: 64bbb7ca40 -s ours am: 1d1b1c5f15 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897530
Change-Id: Ia7c75bcb16e56dc251c4163769c82d125125591a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions