tree ca1470972233cd82ad567d8b1f7dd3ec2e2b82d3
parent 10b388fe9acbafdaa133db7c3f08c0caba10a194
parent e573989e059d6d2db7047e23bf992f1b153ebdc4
author Baligh Uddin <baligh@google.com> 1465391463 +0000
committer android-build-merger <android-build-merger@google.com> 1465391463 +0000

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

Change-Id: I8d196f18d64ae8231f6bb41ffdffbe949a0d0cbd