tree c1f9b1580b091db9bdaa2532bdd81acac2819ba9
parent a616c8196b38c77a5ddbcfd912b7d31455db380c
parent fee70ce9a15d2000566eb9ad5718bd78b9aaa48f
author Bill Yi <byi@google.com> 1464740775 +0000
committer android-build-merger <android-build-merger@google.com> 1464740775 +0000

Import translations. DO NOT MERGE am: 6630d7e2dd  -s ours am: b039363afe  -s ours
am: fee70ce9a1  -s ours

* commit 'fee70ce9a15d2000566eb9ad5718bd78b9aaa48f':
  Import translations. DO NOT MERGE

Change-Id: Ia165bd41b598f2e17e3a9c6ffd4e7e34188abd2b