tree f40511da3bbcbcb57dd68c4a5a669f3a6e86b527
parent 744d880247d102c50cc9f2d7475f96ecf75cba8d
parent 531bf87ddab67c62461f01cd0769755b6087d8af
author Bill Yi <byi@google.com> 1509349721 +0000
committer android-build-merger <android-build-merger@google.com> 1509349721 +0000

Import translations. DO NOT MERGE am: 11fdfbdee8  -s ours
am: 531bf87dda  -s ours

Change-Id: Ie92ebc652432c94f4ea462bd2c71c7ad16dd469d