tree c5e36a2a141285d2d78a2a6a60d721ecd288e829
parent 12455136310bd2f7685adc7b6ba0bb98fdb5e9f4
parent 33c2ed341e376bf8778cf10a98ace072e2ea3bbe
author Bill Yi <byi@google.com> 1464018958 +0000
committer android-build-merger <android-build-merger@google.com> 1464018958 +0000

Import translations. DO NOT MERGE
am: 33c2ed341e  -s ours

* commit '33c2ed341e376bf8778cf10a98ace072e2ea3bbe':
  Import translations. DO NOT MERGE

Change-Id: I7bccf3278100eeb0a92248625d5a887a69a135cb