diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 07:00:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 07:00:15 +0000 |
| commit | 4142de2e84d7cf0c3d1677cf659ad0b1a29d466a (patch) | |
| tree | 27e95c6ace9d22e7855824e545c92224a1a922ab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 416e142f1285547be2c4d6036679f32b7006add3 (diff) | |
| parent | deb3de56af27a45e9297800715973bf95026c82d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80feb8df3c -s ours am: 678ad90f1e -s ours am: deb3de56af -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532274
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I170b4ca053710560a0367b8270f401306527f1a0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions