diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 07:06:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 07:06:33 +0000 |
commit | 7d56f363eeb75fc3c758c8ec634e4889199b6032 (patch) | |
tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4edbbbfce3bf9bf00c56b64d268570859003793d (diff) | |
parent | 42463d782a305757ced25bf64488e68fab5e5539 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e5e8ecad1 -s ours am: cc6a658fe4 -s ours am: 39ff4d2167 -s ours am: 42463d782a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860338
Change-Id: I4272d38bdbf37acb3503ddc6926095ffe9fbdb3a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions