commit | 297c0d4f96117bdeaebc4392bf3eaa25a7f2e265 | [log] [tgz] |
---|---|---|
author | Jungshik Jang <jayjang@google.com> | Mon Jun 02 11:43:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 02 11:43:55 2014 +0000 |
tree | 195b87c53dc710ea9d45320d844d74897ac3e843 | |
parent | fe773e37ebe8ac09fed4a6d5166e45fa38fcca04 [diff] | |
parent | ae8ef37c90f15c56c92b0ad61355366ac7983d4c [diff] |
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.