tree 9bd27d1ba963d26dc28c1238366a7ff02c3d27d9
parent 2cde1d71498e5164cdbc5ffff41465e0bc3259e2
parent 7cb18e0f21f089682b49011865a7b6b7111925a8
author Bill Yi <byi@google.com> 1459810918 +0000
committer android-build-merger <android-build-merger@google.com> 1459810918 +0000

Import translations. DO NOT MERGE
am: 7cb18e0  -s ours

* commit '7cb18e0f21f089682b49011865a7b6b7111925a8':
  Import translations. DO NOT MERGE

Change-Id: I7a86ef608d432047fdca753771cb58a369f342e7