tree e3d11e127c5561934b1fc8d5996a53e51e659333
parent 8a0f9dd59a32c572a8e2a8fc4943283876669700
parent 1b49042a6acf996f8c2afa82193a7d183716055b
author Bill Yi <byi@google.com> 1485852101 +0000
committer android-build-merger <android-build-merger@google.com> 1485852101 +0000

Import translations. DO NOT MERGE am: 652182376c  -s ours
am: 1b49042a6a  -s ours

Change-Id: I511fbfdc62022fd75a5690e789c8e19c51ad5ced