OSDN Git Service

am 1647d472: am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
authorJaikumar Ganesh <jaikumar@google.com>
Mon, 13 Sep 2010 21:42:36 +0000 (14:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Sep 2010 21:42:36 +0000 (14:42 -0700)
Merge commit '1647d472a8c04069a0aab22730a54ec374185ea5'

* commit '1647d472a8c04069a0aab22730a54ec374185ea5':
  OutOfband pairing user dialog.


Trivial merge