OSDN Git Service

am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
authorJaikumar Ganesh <jaikumar@google.com>
Mon, 13 Sep 2010 18:52:15 +0000 (11:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Sep 2010 18:52:15 +0000 (11:52 -0700)
Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp

* commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120':
  OutOfband pairing user dialog.


Trivial merge