diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-17 21:04:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-17 21:04:12 +0000 |
commit | 80e34a6b69ae9099c216f6d3cf4ab34aa1bdb2b5 (patch) | |
tree | faa490fe5bc0c4e92a57b565e0c9b1440dc90b0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8f637195518c8e1f295a3ef08d82563da9bebc7f (diff) | |
parent | 71e02e9318ccfeeaeac9e8a00c95dc016a309206 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e323bfb2bc -s ours am: e03f419b66 -s ours am: 71e02e9318 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590971
Change-Id: I5fac066faf11a8a52c54b3d5f818b8ea487dcb20
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions