tree f1122d9503c41fc04d00baaf2cd6228d05f09775
parent 47e18eceac493695270c296773fdced02b1513ca
parent 1304f3b36a6f3154c3607004c91f3cd7dc2644db
author Bill Yi <byi@google.com> 1493320521 +0000
committer android-build-merger <android-build-merger@google.com> 1493320521 +0000

Import translations. DO NOT MERGE am: c3bf78b1ea  -s ours
am: 1304f3b36a  -s ours

Change-Id: Ifc9347d1e756cb9c9e25881fe89f61c484a2f34c