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