tree 903397913471a9e87db2840314dcf955119c3e55
parent ab48c22e7d8193b4dec82c9115717f57e8ad54c4
parent a6daa21db833191a4e83aac5c488f971bff4578c
author Jaikumar Ganesh <jaikumar@google.com> 1307477855 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307477855 -0700

am a6daa21d: (-s ours) am 015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread

* commit 'a6daa21db833191a4e83aac5c488f971bff4578c':
  Import translations for cherry-picked Bluetooth changes.