tree f16027c118b17ff680750d876012b663b5b2fe2d
parent c6b0b20624e5be8c6c84e0ba07e686e8212385cd
parent d2397fbc5985c237b1312f19f26f8a81355ff022
author Geoff Mendal <mendal@google.com> 1436982766 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436982766 +0000

am d2397fbc: (-s ours) Import translations. DO NOT MERGE

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