tree f8d3d3cc6723cd2e7e46ab8f0bd1ff38206468f1
parent 020533189e383dc23dc90b83c8ef073271174383
parent e01fca71d4c33e288c4e812a86b14065b0afdd54
author Bill Yi <byi@google.com> 1465142726 +0000
committer android-build-merger <android-build-merger@google.com> 1465142726 +0000

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

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

Change-Id: Ie0e410486587fc08ef1318b6dd26bb4e01544694