diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:32:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:32:04 +0000 |
| commit | 4f3636fdd6fbe348bec00ca36995ec8ec716ed52 (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 12653eafb41a5faeb08f225326cbd3c7ec5a9d9f (diff) | |
| parent | ca908107479287892b9e8b6ed7a81b74e8dbaa3d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 38991cd74f -s ours am: 279976c789 -s ours am: 29ff1de466 -s ours am: ca90810747 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937073
Change-Id: Iae41567dc4cd0a60f15f25440ad5eb05d3b6bbaa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions