diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:00:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:00:17 +0000 |
commit | 0d179cb5fe1fc5015a7cff9c4293210356555355 (patch) | |
tree | 4ee6e17fb52da019869bb8c0a53170c0c1976a94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0bc45da54f3c7065b51768d82622a3b40a495e51 (diff) | |
parent | 766a6861cae7daedff6ddd1684eaa839675f6a29 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 776cb394b6 -s ours am: 766a6861ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894373
Change-Id: I61482e5b838fb78e6d9aa190a6b51ffc479a3dc5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions