tree 5c7387a9990fed2754bf3d6217247dea7ef34569
parent c3ace180d0853185da19b49e9668324faa9f468e
parent 5469ff8b3f9966c6f141078b37da5f178b7825e4
author Michael Chan <mchan@android.com> 1257879996 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257879996 -0800

am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground

Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground