tree c51cf5f96e3447aa0790ecd08800780cce4a7742
parent 93eb2c919ecdf32125220adbf5a2fa743af10667
parent 6f9ac302fd39ae6eaac182b9c67a7052eceec5e6
author Bill Yi <byi@google.com> 1508519542 +0000
committer android-build-merger <android-build-merger@google.com> 1508519542 +0000

Import translations. DO NOT MERGE am: 2c8f1b6462  -s ours
am: 6f9ac302fd  -s ours

Change-Id: Idbbbde6db0c2415ce7895aa5d35ff7bb6166dfa6