tree bda44a2d6fa975690c0162facb1c5996cf1432e4
parent d85342515f5065eee353fbac489f1f3cf57c0ff3
parent 5a619aee3889b3cc278ddcdcc683aea047806ccc
author Bill Yi <byi@google.com> 1464976303 +0000
committer android-build-merger <android-build-merger@google.com> 1464976303 +0000

Import translations. DO NOT MERGE am: ea329ca23a  -s ours
am: 5a619aee38  -s ours

* commit '5a619aee3889b3cc278ddcdcc683aea047806ccc':

Change-Id: I162e8fea658739cf7d8169e17a80ea23013c0a57