tree 9d6079b355bc4b2c57c8e1d757a0e38514e5a406
parent 73b53d57ae9fc64fe0c22b262f72ce84d5095a98
parent 89186622fa240083a46336a9e5e4ade52c5698d9
author Jean-Baptiste Queru <jbq@google.com> 1293566062 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1293566062 -0800

am 89186622: Merge "Sanitise Bluetooth file name hint when receiving a contact"

* commit '89186622fa240083a46336a9e5e4ade52c5698d9':
  Sanitise Bluetooth file name hint when receiving a contact