diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 06:37:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 06:37:57 +0000 |
| commit | 8a48949a091f64c1c356218467740f6a389aad9e (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4df50ef788720a696050a555b07f63e07672b7ae (diff) | |
| parent | 9cbec70a107cd9ad395773430c533864b702b89c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f3a7728fb9 -s ours am: 9cbec70a10 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420409
Change-Id: Ia71c49376a896239327f0e34afb9ddc35b7d3e9a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions