diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-06 07:14:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 07:14:17 +0000 |
commit | b7870fc874e804a51148985df2792a7cdb394abd (patch) | |
tree | aab7092f24f30dd5960085f1f9b2c5efbcb8003a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0cfedb866dd383344b77e9817aa294e36443f0d2 (diff) | |
parent | 495b0c81af28b0a438496b10014da6bc89b537df (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 495b0c81af -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14098098
Change-Id: I51855a4df7b6ef8b9557b7a6d69f71a51d462a33
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions