diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-15 07:41:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-15 07:41:04 +0000 |
commit | 7d17008a1465f645d80d1af3c729536ee0bbb142 (patch) | |
tree | f7ced031d736e3f68a4c2dd668d450a1c0612d99 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 11ff76c80377df1422ebb3686a3c8295f99e6d6f (diff) | |
parent | 9a9346defbf0a6e3f0a1332a96395643e3b36677 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 24761341ad -s ours am: a9634e0521 -s ours am: 9a9346defb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12384167
Change-Id: I5f0bcb198cab0e5f899c0c0ec56065940235bade
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions