diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 16:54:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 16:54:13 +0000 |
commit | 4c4973248f967a3b49769c7358a524f6a9b61759 (patch) | |
tree | a71cb483710cd1ac8b6c0b1b8a80ebdb11cc05b1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 129e0af9d6b87ae96e92fc6f817762b4caef8c9a (diff) | |
parent | 7b142fb0e493eb0f6005caabd5652efc36cd4787 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: 7b142fb0e4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12156601
Change-Id: I746cc300833efdf694b80069569708e3b42d6465
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions