tree 927d2a8b81c5fcdf7eef777fd2792babce3d5f31
parent 3658e10468d551b98e54e15bb4cabac153c6258f
parent e4872d1849a265e577b9ef66fd0658da897fecce
author Bill Yi <byi@google.com> 1465267246 +0000
committer android-build-merger <android-build-merger@google.com> 1465267246 +0000

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

* commit 'e4872d1849a265e577b9ef66fd0658da897fecce':

Change-Id: I9e555f56da7dcd1ce04406fc80d8716ad4e4cc36