diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-25 05:46:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 05:46:18 +0000 |
commit | 13c8cb549147d75292403c48e4f5354b7416e549 (patch) | |
tree | 7e0dcf104b9a0c0cffc676260159ed2b2130697a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 08e555493f59cfaef6310c63f3b2469bc259ad24 (diff) | |
parent | 5065762f8f6c3b72b5a974d3e4748a44f905bfc8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f32cba8606 -s ours am: 5065762f8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988455
Change-Id: Ie640fe98c5dacf91605b1f24a0da3f09318dd843
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions