commit | 4ccca20c83c31cbcf623d6bf0083125d5705c9d1 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:35:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:35:44 2021 +0000 |
tree | bc163ba196ce38ad2b7503cfa740bb3f8db2fec7 | |
parent | 57fec1f0f573dd9c45c4b3b04b9f1f5be09d3f9e [diff] | |
parent | e14ca84ddbb3201fec09009144ea0a8f9020f67d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: aaf9602410 -s ours am: e0b10728ba -s ours am: 8ad9ec5296 -s ours am: e14ca84ddb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810223 Change-Id: If8c23e92119b09688c4b218bc7de006d7ffd0864