tree 8a0137e1155e712501318fcb7d466ce68caeafa2
parent 8442d300130bf36b5605e7bf93a9564f1b0db166
parent 8694f91a27f9be651c85defd924e72b649ba4fe1
author Bill Yi <byi@google.com> 1501106581 +0000
committer android-build-merger <android-build-merger@google.com> 1501106581 +0000

Import translations. DO NOT MERGE am: d2236dce80  -s ours am: 3d6c3e13ae  -s ours am: a1548f590c  -s ours
am: 8694f91a27  -s ours

Change-Id: I7e3f19071b5095dd9ed35c7633aba38e746f83f0