tree a3a7616ba7ae8fb5c3d8d8ef5985244f6b6a128a
parent 8e980ae069f42180e86a605572b78fd31756111a
parent 9b9e7485747fe60b315aacb05c0c61b802cbc7c6
author Bill Yi <byi@google.com> 1508231611 +0000
committer android-build-merger <android-build-merger@google.com> 1508231611 +0000

Import translations. DO NOT MERGE am: 7b3201854c  -s ours am: f9d7884ef6  -s ours
am: 9b9e748574  -s ours

Change-Id: I8cb8f609daab05e2e7bd352447ed8d0fe9fd0c14