tree 641a0ae55069d448e8331d9dc55e613a53f30f00
parent af825c7e9bdc22bcb03f440e32036e39427a8bd2
parent 7cc5e8d4d8556602113c3cd9ec328ed717ee0050
author Bill Yi <byi@google.com> 1566246009 -0700
committer android-build-merger <android-build-merger@google.com> 1566246009 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 7cc5e8d4d8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb75bc2909ef6f0c34e625a48ffbabe97bcad13a