diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 04:56:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 04:56:21 +0000 |
| commit | 60e40d9c33a63b46f9accb2422955e873076925d (patch) | |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6e5f5e62a49f76a4cb19179671477bf2921dbcd3 (diff) | |
| parent | 4ec3aa4d09ff5ef3e88ee60a886da7d248605032 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd7986c31a -s ours am: 4ec3aa4d09 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618
Change-Id: Ieb1f32339bec7c5739f096a7186a4bbf0343ab4a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions