tree 3705997856069c23496debcd96bb6e20fffdca0e
parent fc40cbf1022ec45f1768cefe536af248e1a5300c
parent 6356f0c3d1b621c0a45142dfe4f3e29aaf1316b5
author Geoff Mendal <mendal@google.com> 1438448612 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438448612 +0000

am 56ba4a80: (-s ours) am 9bb9fc15: (-s ours) am 1480c09d: (-s ours) Import translations. DO NOT MERGE

* commit '56ba4a8055959baa686db3021a855eb5cdb2306e':
  Import translations. DO NOT MERGE