OSDN Git Service

am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluet...
authorJaikumar Ganesh <jaikumar@google.com>
Sat, 15 Jan 2011 05:30:06 +0000 (21:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Jan 2011 05:30:06 +0000 (21:30 -0800)
commitbf403ce6bdc416ab2d8d8dd2614269b1bc96a443
treef2e7e199130d1d9bea9bcd7f8d76f3d8d627282a
parentabd95f3ca791366f0479bdbea3ae26ac72babf0f
parentd8bfcd6f37ddef2f760e12b8d75947dca8939aa3
am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread

* commit 'ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.