diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-23 16:17:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-23 16:17:31 +0000 |
commit | beac21a4c685c096dedc8b4ea8babce5e0268641 (patch) | |
tree | 289dafa00c77338a813eaa8cf44a020deaa12b1d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2c6948585818de4c5f6a6c8ab46cf4d943f0976c (diff) | |
parent | 469222d860dab5c3e3349750bb6a82fb4ba78736 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 252341aae6 -s ours am: 469222d860 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109669
Change-Id: I4e2c1333e8f404e10c57f166c71b3e11172982fb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions