tree 6e775381f07d32b2d79b86378b6d04a4a1e4ce1c
parent 2c73cee9c0c953ebe74046616de0f81926950257
parent 1dcaf504ae6ef4cc39151732e5efab27dfa0f374
author Bill Yi <byi@google.com> 1503955804 +0000
committer android-build-merger <android-build-merger@google.com> 1503955804 +0000

Import translations. DO NOT MERGE am: 00635fcce7  -s ours
am: 1dcaf504ae  -s ours

Change-Id: I3404e2a884f5cd07802d491188582f3d5bac2e91