tree a6f5001210c2506ea287835a1cd84c6851a26a77
parent 59cfcb502d0907af2b4645dc79466541378fefb6
parent b26da96c2c63008892f0c556c8f9bc3c0e374db6
author Baligh Uddin <baligh@google.com> 1462293693 +0000
committer android-build-merger <android-build-merger@google.com> 1462293693 +0000

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

* commit 'b26da96c2c63008892f0c556c8f9bc3c0e374db6':
  Import translations. DO NOT MERGE

Change-Id: I2bc0a2af6955a83486949395faf1b627b84ca371