diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-24 06:28:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-24 06:28:38 +0000 |
| commit | a8e8777ae796deb23b3a2877faf92a056717225c (patch) | |
| tree | 9da2da0cb477c26fa09dc1b78be6a6248c3d25b6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b89508071eed16af033e5fc3f66a818d9f131fd4 (diff) | |
| parent | 56ce45a0a08ab83ec7e9727c96c88d1f3f48190b (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2b11e46457 -s ours am: 628576af1b -s ours" into rvc-qpr-dev-plus-aosp am: 56ce45a0a0 -s ours
am skip reason: subject contains skip directive
Change-Id: I78712a625b7749fadbc91eee9da932fd4a7eafdf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions