tree b2d70f7ef895990c70afcc288227922eba69e406
parent 2758d1096fb357e34d145b81a0aa2c7e4aeb86fc
parent 3728f8520ba22f994642b498012ef2d78aec5b92
author Bill Yi <byi@google.com> 1473252050 +0000
committer android-build-merger <android-build-merger@google.com> 1473252050 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e  -s ours am: 902770c469  -s ours
am: 3728f8520b  -s ours

Change-Id: I43306b0adfd10a80a34147b7dfa5d84ff56fa946