tree a33fc586a17d10c4d09264ca8cd063155d4cd5ab
parent 03dede4b0166db4f1c0accf3ae62980ab63b2660
parent e0568aa32c4fa02dcdf56185869fbbe0ca357241
author Bill Yi <byi@google.com> 1470780564 +0000
committer android-build-merger <android-build-merger@google.com> 1470780564 +0000

Import translations. DO NOT MERGE am: 9bd16ea906  -s ours
am: e0568aa32c  -s ours

Change-Id: Ia7e06528585bb0d349497545388a401143097e09