| commit | 1647d472a8c04069a0aab22730a54ec374185ea5 | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Mon Sep 13 11:52:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 13 11:52:15 2010 -0700 |
| tree | 12969417fec854185c0ac828c6e5ba8ad837f2a1 | |
| parent | 2af8a0076ed7eb8e75cc6e3def117835214b2773 [diff] | |
| parent | e714898a1abfd828a239e1be7b3f75e2a3cc2120 [diff] |
am e714898a: Merge "OutOfband pairing user dialog." into gingerbread Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp * commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120': OutOfband pairing user dialog.