am 45679d94: (-s ours) am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread

* commit '45679d942fa47b947b4ce7b45b82998b2972928d':
  DO NOT MERGE Show user dialog for BT.