| commit | ec647e2efa1ef4ac297ce2a262d33d99f0db8578 | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Sun Jan 16 10:43:56 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 16 10:43:56 2011 -0800 |
| tree | 7ae5a908841a12a634cdd542ea8f5152acd7aa84 | |
| parent | 2313e6a9320dfa9575f0955b6cc6f5f76ad2160d [diff] | |
| parent | e76ca5e0f1cd7b5417ed5bc05ef4cbe968e8197e [diff] |
am e76ca5e0: (-s ours) am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread * commit 'e76ca5e0f1cd7b5417ed5bc05ef4cbe968e8197e': Do Not Merge: Expose insecure rfcomm Bluetooth API.