diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 16:42:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 16:42:16 +0000 |
commit | c6b251899aef0487dca7df34045f5588d84e1b61 (patch) | |
tree | 0086bc7f9cfd7055094342ae341610753985d4a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e49ad57ccf8fd95f2f901f26ece1c2e74d9b5aef (diff) | |
parent | dbe800ec18c819d082fed890e28e8a9bbb929f57 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 90b58db3d7 -s ours am: d142961f48 -s ours am: dbe800ec18 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014033
Change-Id: Ia1ef89d926728ca49850d700e4d96ad1ec91386f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions