tree bba1c61e3a35f7dc5db56f3cf8f9621336e476a2
parent 9900d875407f9d97d11d269bf078b325a69b7699
parent 6e98ab6273a65a39793c3c2003c042488ba9de36
author Bill Yi <byi@google.com> 1502084437 +0000
committer android-build-merger <android-build-merger@google.com> 1502084437 +0000

Import translations. DO NOT MERGE am: 9354ca48fb  -s ours am: 4a32ddb33f  -s ours
am: 6e98ab6273  -s ours

Change-Id: I1e186e995a0111f3975318ade11ffa5ee6f34562