tree 664e9e84c1885cb8d8dcafee5bd2f48143ac2645
parent 631b0fb9bc72d1f88f3394ede8ad7c8580621c49
parent 516aac32aea353b931786d62209e750e7bbdd446
author Bill Yi <byi@google.com> 1494967664 +0000
committer android-build-merger <android-build-merger@google.com> 1494967664 +0000

Import translations. DO NOT MERGE
am: 516aac32ae  -s ours

Change-Id: I2497922c90cd30a7b8007b3b5adc204b8295aaea