commit | 6e43f9a50c0c84101473a4344ea1e7105083b29b | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 06:42:52 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 06:42:52 2020 +0000 |
tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
parent | 60e40d9c33a63b46f9accb2422955e873076925d [diff] | |
parent | 0d0dc9fa8b91472ac4ec2547d99335540877995d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b14bdbdd74 -s ours am: 0d0dc9fa8b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12517473 Change-Id: Iaf453e15b5c8db7c80ca2e8d913542ac4889e9c1