tree 3c5b1268e41041065e39d46b2a85811d5c282002
parent 82eff791032f243a1c9e4df9ddbed3f1d93373ed
parent 225c634f99911c373c99c2aedfda47f9b04eb335
author Bill Yi <byi@google.com> 1474307923 +0000
committer android-build-merger <android-build-merger@google.com> 1474307923 +0000

Import translations. DO NOT MERGE
am: 225c634f99  -s ours

Change-Id: I736df56414345c07d99630433996abf2819d6ece