tree 5aa170abb4c675c687c1e40f91897d5f08f24790
parent 1cf81d9aa38a340c6072fd3e051e2b28f86e851c
parent d66a7c29f4547354b9af310ef4f34add0f0f91e3
author Bill Yi <byi@google.com> 1569421693 -0700
committer android-build-merger <android-build-merger@google.com> 1569421693 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3db1e788a2 -s ours
am: d66a7c29f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I144c3ee575c566090c9bc10f1bd7c24f1781591c