tree 4ccc3ee433270f7ec922e7e6d04aa553577c734d
parent 7abc548deac3be5c9baa8c1d2ad1a4a752787701
parent 365e0235398893f9b87ef3c3c58f1dddbb0c51e6
author Bill Yi <byi@google.com> 1505590367 +0000
committer android-build-merger <android-build-merger@google.com> 1505590367 +0000

Import translations. DO NOT MERGE am: c9b0416842  -s ours
am: 365e023539  -s ours

Change-Id: If9b18bede5c5161a26fd96c841c137a9e5fa5d29