tree 7728b1f039d9911679cca2fd194cf11d245c55af
parent 9351e5f083c459429630f05aeef2cfed4944d516
parent 9a22968ff80effe37c8c54efc8f66db4ba95f565
author Bill Yi <byi@google.com> 1477377469 +0000
committer android-build-merger <android-build-merger@google.com> 1477377469 +0000

Import translations. DO NOT MERGE am: 475763d01c  -s ours
am: 9a22968ff8  -s ours

Change-Id: Id515f8c57aeb9c6a478d025b4a7223acb8163b72