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