tree c68cd4eae5e1ec9f9a87785593ff553a9dca0454
parent c27646f9f1633797be018001f6c04faab8bdb515
parent 29c7a347b92cc4696ac89248f03228944a57673f
author Bill Yi <byi@google.com> 1461589451 +0000
committer android-build-merger <android-build-merger@google.com> 1461589451 +0000

Import translations. DO NOT MERGE am: e59f5de  -s ours
am: 29c7a34  -s ours

* commit '29c7a347b92cc4696ac89248f03228944a57673f':

Change-Id: I428ab05040ef8033999a6cf3cf21107a073c7c69