tree f0fefed4dba5c52765934e93adbd7f841676660f
parent 7dfce753e1f548859210c2d7020916e1f0f411df
parent a907e62e532dcad7905ba9ae272e180f8042f787
author Bill Yi <byi@google.com> 1546047536 -0800
committer android-build-merger <android-build-merger@google.com> 1546047536 -0800

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

Change-Id: Id2e1cb5e4e4d11299194ee36e6faeca670b8516a