tree 84230245b6d0620425180d5fab12ff558de999ab
parent b45376b9b92602d53d110c8656c681212d549028
parent f51a45960848ed55f92ded99734acb33588d1918
author Geoff Mendal <mendal@google.com> 1440685098 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440685098 +0000

am f51a4596: (-s ours) am f484bb16: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE

* commit 'f51a45960848ed55f92ded99734acb33588d1918':