diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-17 21:03:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-17 21:03:59 +0000 |
commit | 8ddaff90ba6051debc3133ae3ba30c0a3991e0a2 (patch) | |
tree | bd569c8a2e6da9d85ca7901228f5161bb47ceb10 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e682d0ea9deb8ae8ddc2cf7283d83d59499ae417 (diff) | |
parent | 92b073f947092875b91a8f96edd28a0ab6d36042 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e3cbdad558 -s ours am: b009bbc13f -s ours am: 92b073f947 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598025
Change-Id: I5b081a6b684f0092a6e65ad4e98be63484e9616f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions