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