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