tree b1f25382b7972939a60451df9634f0ba036669af
parent 53702077442c35f639075f87e5b95fcbb437776f
parent aeda68c64c46fd3ea28bbaa78d5c4f89b49eadd9
author Bill Yi <byi@google.com> 1529607310 -0700
committer android-build-merger <android-build-merger@google.com> 1529607310 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: aeda68c64c  -s ours

Change-Id: I20507d4398d330aeaa4b707dd61617635922bd27