tree dc9a739f5975436d57d976b224c793676c1b7b6d
parent 97944c00fea9e5eba6d0ef08fb0ab5bffeed33ba
parent 3e8a8c97bb46ee58bb42c5352ad5962da96bae9d
author Bill Yi <byi@google.com> 1476436124 +0000
committer android-build-merger <android-build-merger@google.com> 1476436124 +0000

Import translations. DO NOT MERGE
am: 3e8a8c97bb  -s ours

Change-Id: I55e6b60d44c99e47783526de2176bbd7c9929b47