tree df66b7caa1d3285eae675e71fb0d71eb69e0962c
parent 7163ed6ce8bb4d79b8543e6aa2b2013b4baf9e0a
parent 5ee8a49e8f266989618cd11768741cc166ecbf34
author Geoff Mendal <mendal@google.com> 1458736957 +0000
committer android-build-merger <android-build-merger@google.com> 1458736957 +0000

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

* commit '5ee8a49e8f266989618cd11768741cc166ecbf34':
  Import translations. DO NOT MERGE