diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:53:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:53:44 +0000 |
commit | b51e70151598050d7ca99606d3e4f12348a3d766 (patch) | |
tree | 93c73b4da8d78cd3f150cb8fc10befb4fb5aaa64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c5a963503b689b9eafa504c8b385a1f35f5de525 (diff) | |
parent | 1be8c68b17e9c658611e0677c1844e182c9ddaaa (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8c312b928 -s ours am: b0eaff92c1 -s ours am: 5af60f2cb8 -s ours am: 1be8c68b17 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11964771
Change-Id: Ifaec250876d74f4e4559a5aa95d2e3fd2b7fdc2d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions