tree 81a763937e62af4345680f46600ec82084e89429
parent 052dce27c9bd59e8ee1cbf1b2bccb36167d04a9e
parent c906d9dc72b4a319d6f8e716bc00416df3bd1a00
author Bill Yi <byi@google.com> 1473250462 +0000
committer android-build-merger <android-build-merger@google.com> 1473250462 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c906d9dc72  -s ours

Change-Id: I428f022461de19aa0e3190884387deb819938e0b