diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-10 22:53:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 22:53:17 +0000 |
| commit | e8fe1794d266c9899c65297f9aff5450ae0558a1 (patch) | |
| tree | 72ed70b402681c1fbb97b86e64c2b80f37ae8f64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 431bbeeab4cecc7a72df2ad34ec2bb02a4fc7938 (diff) | |
| parent | d9b7772c525db499b50ce8d35c978d77e5c09f2c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours am: d9b7772c52 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508304
Change-Id: I630c5c03ab27e998380f2c7515a45d4537be89ba
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions