tree e3d1265690b6997798e89851649f401fab977e58
parent ac72cb15838b9312d72fc40bd5c2e21228197baa
parent 3e1848fda503ef50e296cc934e5ca50797db598c
author Bill Yi <byi@google.com> 1464997245 +0000
committer android-build-merger <android-build-merger@google.com> 1464997245 +0000

Import translations. DO NOT MERGE am: 431ffdc8d6  -s ours
am: 3e1848fda5  -s ours

* commit '3e1848fda503ef50e296cc934e5ca50797db598c':

Change-Id: I879bbc61fbb816ec7af9464abc34ab6487d679b1