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

* commit '38ae9125b4535d44b608359f3345fd75d99cc7a5':
  DO NOT MERGE Show user dialog for BT.