tree ac0b71a6d604f495ea4006b070ed671cc7067145
parent 5c23b801e5f29ca85dde4a58fde4a69faacd7c6c
parent f75b6e47def859039627a557c1046f1fc723036b
author Bill Yi <byi@google.com> 1459826794 +0000
committer android-build-merger <android-build-merger@google.com> 1459826794 +0000

Import translations. DO NOT MERGE
am: f75b6e4  -s ours

* commit 'f75b6e47def859039627a557c1046f1fc723036b':
  Import translations. DO NOT MERGE

Change-Id: I948c6f31dd9c54a1f1abc5e0fdccb6571f095eb6