tree f6797ed74906c47a6ba42c1be462f4639ccb1bf4
parent a4ef858f83c7aeda0fc8cd5a4c80f04f0351267d
parent 003072d6158eb088572e1708ad474dec09684a4c
author Bill Yi <byi@google.com> 1470956058 +0000
committer android-build-merger <android-build-merger@google.com> 1470956058 +0000

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

Change-Id: Ia93dc2f69830a10f53970f69219d19b595c14167