diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:27:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:27:32 +0000 |
| commit | dd6470e67e4bea9944f1b3ee7126268a76eb7290 (patch) | |
| tree | f6e26618ccadc5bd488d26de9acced7fa9f4f97e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1288ac2dec64a9a07fae5d333cc34534c8ca153f (diff) | |
| parent | ca39a00feaf5b1fd7dfd4ff37c20741b0b5e0c84 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ab2b90ef34 -s ours am: 0baaa00ffb -s ours am: 515c41815f -s ours am: ca39a00fea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11904325
Change-Id: Id1a6c2b441151c8b0fdc686ae856d767f95325a0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions