tree 3f133981fa0f7a6c20c39ffb34058c30b696feb3
parent 188727c71e728ee0396e0c55747b102772bb1351
parent 8ea8e8cf701bf1ff3b27fedd4068523a090c9a48
author Bill Yi <byi@google.com> 1467323669 +0000
committer android-build-merger <android-build-merger@google.com> 1467323669 +0000

Import translations. DO NOT MERGE am: 4a8554f78b  -s ours
am: 8ea8e8cf70  -s ours

Change-Id: I96a6fc7cfc031a41f692bef0c8456ad8276143bf