tree 70c36e82763ceed6d3ee0482e40f8c7dfcc47434
parent ca4daf90e09a9a366c6400b9eebd290f61c430b8
parent 49a9d35eb723a8933f639943e32616aee3392b1a
author Bill Yi <byi@google.com> 1486112562 +0000
committer android-build-merger <android-build-merger@google.com> 1486112562 +0000

Import translations. DO NOT MERGE
am: 49a9d35eb7  -s ours

Change-Id: I2c4aa7f43a77a81b529fe0b05b1e51b46ff3e3c9