tree 9ab022d543b5db33493e73994bbbb5cff5da3902
parent 00ba86b88319a9d6eb0b2df84658b513b92530eb
parent 8197fb837d6ce679d6d824ad14b70aff6e13331f
author Geoff Mendal <mendal@google.com> 1436983702 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436983702 +0000

am 8197fb83: (-s ours) am 6bee1681: (-s ours) am d82f26fd: (-s ours) am c84ce200: (-s ours) am dcb985ea: (-s ours) Import translations. DO NOT MERGE

* commit '8197fb837d6ce679d6d824ad14b70aff6e13331f':
  Import translations. DO NOT MERGE