tree 25e090f9cc465aea0761ee721fcde3aadf0f3556
parent eb4bd930d8c4f839142c8a90c83cbe580d5dd419
parent a68b3e37d758f0c305e0848f89a2ace8c691d3a9
author Bill Yi <byi@google.com> 1470422128 +0000
committer android-build-merger <android-build-merger@google.com> 1470422128 +0000

Import translations. DO NOT MERGE am: a9d39db63b  -s ours am: da3f395420  -s ours
am: a68b3e37d7  -s ours

Change-Id: I6314a8fc73de504117fa4576c671dc99e1b80bca