tree fed3e550a22538850d3adc150e3ffd4c6c8daaf8
parent 9e2dc14649549f5fa54dcdda423c27afb802e8a6
parent 4188754a4e38b3ba5a20ce1fc2bcc222aa00dd72
author Bill Yi <byi@google.com> 1494503485 +0000
committer android-build-merger <android-build-merger@google.com> 1494503485 +0000

Import translations. DO NOT MERGE am: 985a29e9e9  -s ours
am: 4188754a4e  -s ours

Change-Id: I9d32bbd8e220ffd8c207e94622dfe6f14c7f29d6