tree f6797ed74906c47a6ba42c1be462f4639ccb1bf4
parent 358255352065c80ecfed5e44603a322551366434
parent 421c48ee8be85aee4c39c8b297a0cd9b1115246c
author Bill Yi <byi@google.com> 1470955638 +0000
committer android-build-merger <android-build-merger@google.com> 1470955638 +0000

Import translations. DO NOT MERGE
am: 421c48ee8b  -s ours

Change-Id: I9c0d0e09d32a8e72734dd2acb41dc44888b979ce