tree a87346eb22b56df964e4d47f9b8347bf1fdb75ce
parent 9d11c9e21daff99df62e510fa7e86f57801dd8dd
parent 82f06385f341a0af346374a62f441763da4d4dbe
author Bill Yi <byi@google.com> 1470781074 +0000
committer android-build-merger <android-build-merger@google.com> 1470781074 +0000

Import translations. DO NOT MERGE am: 92d193624d  -s ours am: 1fc6a2541a  -s ours am: 9a59c0f14a  -s ours am: 90a7fc8365  -s ours am: e2a22e87bf  -s ours
am: 82f06385f3  -s ours

Change-Id: Ib667b13d037dbe1c44a54fce9e2046a2175be01d