diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-18 01:22:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-18 01:22:10 +0000 |
commit | a4ca4aa28cb98ab1b4b38069c018426f15bf21ce (patch) | |
tree | bf14da1d27293a97ac65148154c5ca896f5afe0f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 51c2c5ad05a7df000ce50d8c1795daf57a4c022a (diff) | |
parent | 6f7ecf32e5063e16b7d010517624f103fc225cea (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 60b7757fb4 -s ours am: 6f7ecf32e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600807
Change-Id: Ie0caa8193b46bcd5f9eb83a857ff9bb16a323b76
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions