tree 1678aa1dde998d320e62cdfd2b1783f111b5379b
parent 5e172c0abfabbee7c40049fb9fdeaebb94b35f8c
parent 88592408dd9900ccebe9137b7ea05fd4ef5feb9b
author Bill Yi <byi@google.com> 1466138942 +0000
committer android-build-merger <android-build-merger@google.com> 1466138942 +0000

Import translations. DO NOT MERGE
am: 88592408dd  -s ours

Change-Id: I29792abcec3c74c9e555a6328461e53dda62e24f