tree ee144fb91555b05e0ad4dee1492733e338fc2634
parent f7268653331bf20740b9dfa211f05d204905befc
parent b162551a30ce45e991fbd24f0647b6320d3b9b67
author Bill Yi <byi@google.com> 1459882268 +0000
committer android-build-merger <android-build-merger@google.com> 1459882268 +0000

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

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

Change-Id: If605bd508a2f61db0d96b4f6261aa59c92486e0b