diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 06:17:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:17:14 +0000 |
commit | 6ce23c33e5fd39984fedd1f5660aea395b3af008 (patch) | |
tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5e05e1d123d67ed6b71287857205edb8992af678 (diff) | |
parent | b1a4e05c933157f95f5e633bb7532594c845203c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: bcec292d51 -s ours am: fb226f5848 -s ours am: 37d1036733 -s ours am: b1a4e05c93 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860178
Change-Id: Id14d2972d89b884de4f5b4c39d08460f6086c7e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions