diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:21:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:21:52 +0000 |
| commit | e78ff11f752c06718286a30c3e0adec806d6489e (patch) | |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 22bca9c10b2532884dc12ed15796d650e717b111 (diff) | |
| parent | ace37a2868cdf897b0c8352d114f816bb6623b45 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e1c70339e -s ours am: ace37a2868 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519356
Change-Id: I2e9077d396090c06bfe845ea10024f103d76fa51
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions