diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-05 21:22:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 21:22:24 +0000 |
| commit | 640a7ef39582bc3b144d83d643958e9e887ec15c (patch) | |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 756ef7c5e703fcfe7b9b58ee54667304330bc792 (diff) | |
| parent | 9fb7a90dbccc85799e5f58a9a2652400a0fe9234 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fdbeaf63ec -s ours am: 9fb7a90dbc -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519345
Change-Id: I9f9050f1461894c0af861a37407f79931cccfbff
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions