diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-16 23:35:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 23:35:34 +0000 |
commit | d779615ae8d97bc72c2598b22963d8646ed29172 (patch) | |
tree | 7c2c08785d3b102dae5007b8aa7ea78f8cf8d4fa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 03e2b13100e3120864382e7085bda4547de6617c (diff) | |
parent | e8f323c8edf13bf216d32fe9ae4ac87f4b87d754 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 02f853ebe6 -s ours am: b9e95898fd -s ours am: bfd15ac6cd -s ours am: e8f323c8ed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842829
Change-Id: Id5012fd73081c441c69834a1cdf9e4ab757b855b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions