diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-10-05 12:51:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-05 12:51:48 +0000 |
| commit | ffd887f1befdcdbc58e546e3390aeb6e1895da16 (patch) | |
| tree | 6ae42498d9512d9fb6c63762f7c70c5df9d8d595 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 152c6673d544808056679406f32c77b7dc626847 (diff) | |
| parent | 3ba8073d1c6d87cb407b4d8a98828a644d19ee6e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2bce62522f -s ours am: 3ba8073d1c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15961562
Change-Id: I75ae9f91b9baee11e0b22b07d73a10113111b2f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions