diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 06:44:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 06:44:14 +0000 |
| commit | 25e69b7fdd85e85c529eeaa034a2d526699f53b3 (patch) | |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6e43f9a50c0c84101473a4344ea1e7105083b29b (diff) | |
| parent | 29170e5f45ab1284ae2439c8c5102593fb217cc2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bc080eb257 -s ours am: 29170e5f45 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516984
Change-Id: I7cf9c0bd621cfd478a82a5fca0c694664f5eb261
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions