tree 5d714ed2203a4512341bd7c299bbe798a619af8a
parent b9b41b835ede0d1d3dc0f050e174150ff5084692
parent 2deaba905f031fb1d7c871d34848c35f178a6fed
author Bill Yi <byi@google.com> 1471381654 +0000
committer android-build-merger <android-build-merger@google.com> 1471381654 +0000

Import translations. DO NOT MERGE
am: 2deaba905f  -s ours

Change-Id: I4d456a029be23f5a716cac7b3132cdf82f27bac9