tree ac91923d22e9abaee9b4d70c636788cea8526926
parent 98f817831194293a8383e2241f513165a30a7135
parent 1e7a412ee335e2e2f8f98f408ba95f5cee4f95c6
author Bill Yi <byi@google.com> 1498918432 +0000
committer android-build-merger <android-build-merger@google.com> 1498918432 +0000

Import translations. DO NOT MERGE am: 0256289bf6  -s ours
am: 1e7a412ee3  -s ours

Change-Id: I6e7fa59ae61c7688a88ebdbc3d430042a96e969b