diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:21:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:21:35 +0000 |
commit | 1c8cd0ccbec30af1e146a2ada808b4fcc3936ff1 (patch) | |
tree | 58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1ac45864620dd7b1587839d869ad435c74e7aee7 (diff) | |
parent | 16943c441da54932d8f9986f66cbf97a94a35acb (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 45b2fcf55d -s ours am: bd52820306 -s ours am: 16943c441d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937072
Change-Id: If843ebb4b157cdde8574871e677fa1a8293e9ea6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions