diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-09 23:05:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 23:05:47 +0000 |
commit | 8ced87d1639d96ece2e98ad5fb48026799aa55d5 (patch) | |
tree | d4fdd195bcdc480e0ee4be1bb31bcb9182599942 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6200c35d5b53cb7afb90df476f455ca430a69093 (diff) | |
parent | b3b360a66113814c3b3e53f66bc7ab7e9b352dff (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cd259caf54 -s ours am: fa42ef82ca -s ours am: b3b360a661 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809238
Change-Id: I881041a87a2ba6cd90c1fc7a21d61ddbac1e756a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions