diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-06 14:42:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:42:01 +0000 |
commit | 9065908251a9aa4c9c2961a2e40bfff55ba0e2f3 (patch) | |
tree | 5d2914bd3fcefe921818736883faa34dbcc7b566 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b0f648c7ad994b035de5214763ecf8d57ad39a39 (diff) | |
parent | 54cea41ef50254622cd4044160305c78fb74bfcd (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3d0177a9b6 -s ours am: 3aa21e751b -s ours am: d329c7fa9b -s ours am: 54cea41ef5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11763040
Change-Id: Ib563c1e72cf9a21598281a8b7ad55242361a2dac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions