diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 18:52:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 18:52:14 +0000 |
| commit | 85cd22e0fb9f73b014c0652ca877e8e297327f90 (patch) | |
| tree | 81de5e2f1abb31a58350f3945e0e743c5a1df310 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0e817330e9d64b282e548e3794e33c8c132c51f7 (diff) | |
| parent | 214718fbec173ea7582ca44541ec09866a5ab0dd (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours am: 214718fbec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170578
Change-Id: Id2c88b412d05f93d1f52510b67c4a1f075a80d62
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions