diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-07 19:57:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-07 19:57:57 +0000 |
commit | 3e85943c402d0ee38388c137889bd08886b0109a (patch) | |
tree | 474d585b30f03bd0db3c07ca2bb1ff49001c050b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 398f0c32c2faddf31367429ae21172776e96588c (diff) | |
parent | b95f4af41ed806e8dde21a9c39b7939d77aae370 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 47c721a3f5 -s ours am: a595256e53 -s ours am: b95f4af41e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15480961
Change-Id: Ic337ba5d53848bf0a0913984214714b48dd17d93
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions