diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-01 15:45:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 15:45:06 +0000 |
commit | 43df8c3e2a75e0cb74cb5ddc093aef405e9c44fc (patch) | |
tree | c898f75c09bfd009aeccbc0976afc8bb947da1df /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6e0e8a4bbe149ed56bfaf5a2c897c58b7004fa04 (diff) | |
parent | b2c80197746732c4b37c2d96cd72018a9fa120de (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours am: 68f5622b33 -s ours am: 5da715a2be -s ours am: b2c8019774 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: I4f0e81783972ed00feb08ae5c6de2e33e382a5c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions