OSDN Git Service

am df9af422: (-s ours) Merge "DO NOT MERGE: Implement device discovery sequence....
authorJungshik Jang <jayjang@google.com>
Mon, 2 Jun 2014 11:43:55 +0000 (11:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Jun 2014 11:43:55 +0000 (11:43 +0000)
commit297c0d4f96117bdeaebc4392bf3eaa25a7f2e265
tree195b87c53dc710ea9d45320d844d74897ac3e843
parentfe773e37ebe8ac09fed4a6d5166e45fa38fcca04
parentae8ef37c90f15c56c92b0ad61355366ac7983d4c
am df9af422: (-s ours) Merge "DO NOT MERGE: Implement device discovery sequence." into lmp-preview-dev

* commit 'df9af422055d97d4743e00f789ae1964318a307b':
  DO NOT MERGE: Implement device discovery sequence.