diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 06:57:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 06:57:34 +0000 |
| commit | 67e13a201fa079ad28fd754c3d690e07cfd2202e (patch) | |
| tree | 67f52adb65da989558cfb08dd6a40fc4f791ec18 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1979294b97dfab1c2e963beaa9925171de00339f (diff) | |
| parent | 8d2894831dd2b77c5c197d75f97864a887853e06 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2cbc87a9bf -s ours am: 82cac19b47 -s ours am: 8d2894831d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534099
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7481c638dde570e253bd9428036f53e1c2cd3f94
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions