tree f940caf66877f29b6864ffd2543f83b078559290
parent 8bbf18078581673489ce39a1a22b002334248155
parent 3e95a70e021d0a93da3947a38bd7b29615e2c177
author Geoff Mendal <mendal@google.com> 1438780833 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438780833 +0000

am 3eca1f1e: (-s ours) am 06ace6a8: (-s ours) Import translations. DO NOT MERGE

* commit '3eca1f1e4a82e9c00233df3b5adf7f443892529c':
  Import translations. DO NOT MERGE