tree e21142c769cb20a35f02ee0d7e17dc35bfdd6c63
parent 00fc3f9350bab201a3fd5659422c0ba85bf7d7ef
parent e2a22e87bf8464b025214c48a63192b6bf229176
author Bill Yi <byi@google.com> 1470780896 +0000
committer android-build-merger <android-build-merger@google.com> 1470780896 +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

Change-Id: I5f3d5469b7c6401c67f35322bcf625b312cb7a71