tree 4065dbc84431d0caad138554d763536adb29a7ca
parent 771d8227b0722565a3d82af02f1daf18b8589a87
parent 2874eca7f6aa7750c6d33e040a1825554ebd0a6b
author Bill Yi <byi@google.com> 1466139781 +0000
committer android-build-merger <android-build-merger@google.com> 1466139781 +0000

Import translations. DO NOT MERGE am: 8cb138efcf  -s ours
am: 2874eca7f6  -s ours

Change-Id: I38dd283e2098f192670c9dd1aeb98f8cbdfa6baf