diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:22:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:22:45 +0000 |
commit | ef111c415131372b3de81c506a780bdda0e77498 (patch) | |
tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c9bf424804550e0b438ba3fdee096236c8af8c8d (diff) | |
parent | c299f6aff2616d432bf0baa4d5ae0843997b2416 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: c299f6aff2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501
Change-Id: I6a7ee80032ca2e2d6e01ba3b372a7654b8c95b5c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions