tree 7587b78ed0259a06b2cd106dd02f7dfc98022cb5
parent 6bf906c13ef72cb0860898b76cf95b9b39496611
parent 22eecbe2743f9128a5974661498bbe9205e3b41a
author Bill Yi <byi@google.com> 1472846593 +0000
committer android-build-merger <android-build-merger@google.com> 1472846593 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1  -s ours am: 347f2b60b5  -s ours
am: 22eecbe274  -s ours

Change-Id: Ie62d911c8ebdd816b50c39a84cd31d481da089d2