tree e7385b4910ce4989e2f8321693abcf5b5b7ba9d2
parent d4274a6fa4697a05817bf99c39deb68d95bbfc37
parent 5098e36f010648faf7368718578431630e6585b3
author Bill Yi <byi@google.com> 1497620805 +0000
committer android-build-merger <android-build-merger@google.com> 1497620805 +0000

Import translations. DO NOT MERGE
am: 5098e36f01  -s ours

Change-Id: I9ff372f2e21d51259578ff0b82bce42e2f5d3af5