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