OSDN Git Service

am 0d799e09: (-s ours) am 1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app...
authorJaikumar Ganesh <jaikumar@google.com>
Sat, 15 Jan 2011 05:30:01 +0000 (21:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Jan 2011 05:30:01 +0000 (21:30 -0800)
* commit '0d799e0964368f67b6ec1d6d3fac90d061a7d160':
  Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.


Trivial merge