tree 09f6d2a7fd13fdd6339c5ef5dc950174e71e77c9
parent d1c387e7c1162356c66a46888b91b9ff5a3fd708
parent 4c90c7f6b536254afa495a464c4e7ce780109e3a
author Geoff Mendal <mendal@google.com> 1439816388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439816388 +0000

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

* commit '549c2a30faeab0ab25246020eeb6cd148e67bedf':
  Import translations. DO NOT MERGE