commit | d6fee88939d25d4f59e9f8b3ab78821cac7306e1 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:24:33 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:24:33 2020 +0000 |
tree | 6131e1f8debab82b8594819d9cc7d4b238415633 | |
parent | 37a9ed4d891fab51fa7907ae409581b2c283284b [diff] | |
parent | 79dff73fcc0e894d8f57deeb4bc385edbe15a8c5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0b0827502 -s ours am: 79dff73fcc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759561 Change-Id: Icf011684e3b1728e5297c67b37ef9a16bd0360c2