diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:31:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:31:44 +0000 |
commit | f659ee96e66b616b642e01bb5405c36a59ea7378 (patch) | |
tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8799921b5564fb8d38729f66db39c499f397ea9c (diff) | |
parent | 4f08143bc93deb6227c09d4a52430abb0ac7ad4a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 01cae8a4fb -s ours am: 25251e4d15 -s ours am: 2d98bee996 -s ours am: 4f08143bc9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937071
Change-Id: Ib9bc6783376504e739270c2141f5d7833ecf6c2e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions