OSDN Git Service

am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection...
authorJaikumar Ganesh <jaikumar@google.com>
Tue, 21 Jun 2011 21:08:29 +0000 (14:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Jun 2011 21:08:29 +0000 (14:08 -0700)
commite53e18bd9d1ee20fecdef0fddb8fae5f158850d4
treefcf60e712c8ec063d65d20af892cd7fd3e822c75
parentd0499c413672cf3447f51e1d03b3b2360cdffe27
parent610b7f28ea7661073586b041e920a1948fe916c3
am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread

* commit '9e5d0de9a333683533a021e9733e824cac666d18':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.