diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-24 17:05:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 17:05:57 +0000 |
| commit | 242ac5616bd26b052eca9b984e1a811397860356 (patch) | |
| tree | 8ecbb842aa40b2c89aecf0cc4bb2b0d2bd51abea /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40026a578412dab297f08d08513c98d19a352bc6 (diff) | |
| parent | 08c8108aca952208b178d5a9fa83274afa75843f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 212cf8a813 -s ours am: 08c8108aca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12222139
Change-Id: I3d595ca950e73818305c14fe2ad480dd3ab77935
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions