diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:00:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:00:47 +0000 |
commit | 3688c865bd6e37159b59cb2359c91a9d1a305c65 (patch) | |
tree | 8c32c232b85b543196f812ce0714456d5d976817 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 711868cf5976c41dda6421096baa5b27dfed090e (diff) | |
parent | 0baaa00ffb0db8bb0c78667d1e084c745e67bb43 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ab2b90ef34 -s ours am: 0baaa00ffb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11904325
Change-Id: I3e699b6892e97ce8d08ae45fae81b5db0b80cd37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions