diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:32:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:32:31 +0000 |
commit | d8db82473b75ee86571aed2c69bebe751a491a27 (patch) | |
tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | db8be6ab527eb6e32ebe5498095fc3a7ad21a822 (diff) | |
parent | 1c8cd0ccbec30af1e146a2ada808b4fcc3936ff1 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 45b2fcf55d -s ours am: bd52820306 -s ours am: 16943c441d -s ours am: 1c8cd0ccbe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937072
Change-Id: I525c99f3927f332620bfd6a2f0db7d3785d35900
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions