tree c3e6c0632c89975dff2defad1d6d45042ccdf771
parent c37856f0be7b43fa769baae2f351a763b0b0876b
parent c0a1b85fe9d571799b592c5fafd26f96f877104a
author Bill Yi <byi@google.com> 1524891697 -0700
committer android-build-merger <android-build-merger@google.com> 1524891697 -0700

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

Change-Id: Ifd8ef3608d72531408fbb928fc45b5ca66b2a3d9