tree 896d476d6043506b99f1e0368cc07970385dae25
parent 9a1c5aed80154a0d50a225d0d15180ba3845d711
parent afcdeda0907230c1be0cb4e603d2793aa0825185
author Bill Yi <byi@google.com> 1558608592 -0700
committer android-build-merger <android-build-merger@google.com> 1558608592 -0700

Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours am: 2a5ccbbe9d -s ours am: d5f0c0f842 -s ours
am: afcdeda090 -s ours
am skip reason: subject contains skip directive

Change-Id: I7757c98972ee2de40e0fec0fc9afe66168e3992f