tree e867f5f445448fa3e60ca73c0437d1998cfe7e9f
parent d42cca9966392fa705d241fa2d889efa8cc8d8c0
parent 90059b7c5c14d1ac79c4a3c0ce2e990fbe0e6e1c
author Bill Yi <byi@google.com> 1464976124 +0000
committer android-build-merger <android-build-merger@google.com> 1464976124 +0000

Import translations. DO NOT MERGE am: e946a53ce3  -s ours
am: 90059b7c5c  -s ours

* commit '90059b7c5c14d1ac79c4a3c0ce2e990fbe0e6e1c':

Change-Id: Ic5040ac54b6e214e2304c6e6edac6b62fc0211e9