diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-09 06:44:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 06:44:41 +0000 |
commit | 58814b7b147b6a37542d8372ddc4e2a9b3658428 (patch) | |
tree | eea3389d75a4f5806a739bc7be0e73dc91464b4f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 79c97eb6d70705851380b30b7749e740a90fb099 (diff) | |
parent | df30aa1a4396ea8c9fa5d14e1d85eedbc8e568a3 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4ca1fdf950 -s ours am: 5b17826cab -s ours am: 21d5206155 -s ours am: df30aa1a43 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803019
Change-Id: If5c98e548fc9bfc61531e01949ec25785f24b41d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions