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