tree b847776f6317929036c446bc8fc8a671dfbc6ecf
parent 395f79d2cf35f16b12ee0556a10432eee9e00c3e
parent d20c8d7fdb5f7075a8e6bdc15a22a85370da7029
author Bill Yi <byi@google.com> 1513883736 +0000
committer android-build-merger <android-build-merger@google.com> 1513883736 +0000

Import translations. DO NOT MERGE am: 6956a426da  -s ours
am: d20c8d7fdb  -s ours

Change-Id: I4e17a1faff827abe81caf7b79a462e5c9c21af4b