diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-01 15:48:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 15:48:53 +0000 |
commit | be754cb73c07dbda85b7456ddabc9c34e0ba411d (patch) | |
tree | f36d3e8586de3dc5d34d4ebada1e15e2e16340ff /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 15dc556f074852480ef9fcd461cccdd5bc493aa9 (diff) | |
parent | 65e7e8a79f4f879dee866bf3200af5ec52683111 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours am: 0c8eb66a7d -s ours am: 65916328fc -s ours am: 65e7e8a79f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: Id4c57d8d04fe273e2919ce4677190d0e5888d3eb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions