tree b3f9975610221ea539504b1c05ea03da053d1489
parent 886076751bbb6411a50a9cb8b5d76ce71f2bbd88
parent 0a0039dfa3f346722489ef2915dd15983aa8c5e8
author Bill Yi <byi@google.com> 1461786306 +0000
committer android-build-merger <android-build-merger@google.com> 1461786306 +0000

Import translations. DO NOT MERGE
am: 0a0039d  -s ours

* commit '0a0039dfa3f346722489ef2915dd15983aa8c5e8':
  Import translations. DO NOT MERGE

Change-Id: I118d2f51022afed8c79376d5cfc132023a6ce758