tree 04ad8e16303204df2d44c0f59ff6afb4c5f948d2
parent 3ff47db35f5400bce27df7375db385c1535d2c52
parent a9e198284467bf561d846c4c46a0368f0798f7bb
author Bill Yi <byi@google.com> 1464744305 +0000
committer android-build-merger <android-build-merger@google.com> 1464744305 +0000

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

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

Change-Id: Ia8f57a4a6699d27c2dd182719a15e0af34e844ce