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