tree 50018abb75984331569e3ff92e000ee1786a6c54
parent 26c7327f6b74d7bfe2dd3d0980b00c99e0c8267c
parent bcfd940be81c267d85bc86d26337e7a12c0dca95
author Bill Yi <byi@google.com> 1508218805 +0000
committer android-build-merger <android-build-merger@google.com> 1508218805 +0000

Import translations. DO NOT MERGE am: cb6b15bbf1  -s ours
am: bcfd940be8  -s ours

Change-Id: I561c7959644a4bec74f9922b051fc547f33bfd97