tree 7587b78ed0259a06b2cd106dd02f7dfc98022cb5
parent 72b880516f6f5ea7bd54c225fc6702a4e5462260
parent 571b44289b3b5af418a7a4c826a7315de4f6e65f
author Bill Yi <byi@google.com> 1472846598 +0000
committer android-build-merger <android-build-merger@google.com> 1472846598 +0000

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1  -s ours am: 347f2b60b5  -s ours" into nyc-mr1-dev-plus-aosp
am: 571b44289b  -s ours

Change-Id: Ica5c639ce2a02fadfcd74c6417491c1eeb16c88e