diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 05:26:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 05:26:59 +0000 |
commit | cec42773c747eca57ddde254121215a49028ce31 (patch) | |
tree | 0086bc7f9cfd7055094342ae341610753985d4a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c1c666fd7d4e548766681d057af0002afbdaeeb8 (diff) | |
parent | 2b757435b95cae634c1e64554b74af11a4794bec (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8315ae79d -s ours am: 2b757435b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014870
Change-Id: I80456cf1f0a99384cd595be29d3e48713e1cd7c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions