diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-09 19:53:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 19:53:22 +0000 |
commit | 844cd81788cd5f0b4c75bec334f62c4f14ab1c9f (patch) | |
tree | 326966927d87926227a94fcd6c7690d395f124fe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 175ff6c5748d2ceeadabe5962ccd27d9cac415f9 (diff) | |
parent | d3a8e0e6e128feae913e17a22d902c1d96c18a46 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0636427470 -s ours am: c17473ca47 -s ours am: d3a8e0e6e1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118651
Change-Id: If2a5e7ffc790506e955d9c73dba9f7423ec54144
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions