tree cee3dfbd0a2df6ca7e9a8559c1a24d2b1bb4339a
parent fda011d2929f16eee485bcf6e526c540bb9ef495
parent c44f6cd011d20ee5acae7680baa6f16791b3de18
author Geoff Mendal <mendal@google.com> 1436979799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979799 +0000

am c44f6cd0: (-s ours) am 75443c18: (-s ours) am 2cbb2d13: (-s ours) am a7866cd9: (-s ours) Import translations. DO NOT MERGE

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