tree d468843476cee34b642145d7100211943c9ca673
parent f965e908d22bb6d4b2a8091b50cb713f1fb28cf4
parent 3e31ca0fcf4cb632fd092f43fab34f1eaa224c03
author Bill Yi <byi@google.com> 1494481406 +0000
committer android-build-merger <android-build-merger@google.com> 1494481406 +0000

Import translations. DO NOT MERGE
am: 3e31ca0fcf  -s ours

Change-Id: I97dcd4a7a82aaeb1eccd20beadd331fa4bf0b5ef