tree f6797ed74906c47a6ba42c1be462f4639ccb1bf4
parent c0d65c98d8234a9195b8b5df66245cc1c0d9eab4
parent 265cf73a43ed932b67bd7f8fb91928b9c7da91cb
author Bill Yi <byi@google.com> 1470955848 +0000
committer android-build-merger <android-build-merger@google.com> 1470955848 +0000

Import translations. DO NOT MERGE
am: 265cf73a43  -s ours

Change-Id: I62cba71ed40ddbb6b19b9f17f490d53aa67ff52e