diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 08:26:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 08:26:40 +0000 |
commit | f6ed167d5a4ace739477396371fd98a08561013c (patch) | |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 719c1e9be180999c95cb234adc7e81bea4fae463 (diff) | |
parent | 4dea6ad968d08d0a797d3c61ba6f0de964ac926a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4dea6ad968 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13171150
Change-Id: Ia385e3ec1a6fea042711a740d54505e639ca840b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions