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