| commit | cb2b95e6b71e546a4a0a4105b938af4cf2c408e7 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Sep 07 14:51:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 07 14:51:31 2011 -0700 |
| tree | 3ad2d1cb27f34dcb900a38e90ca849cc699b3476 | |
| parent | d4e4606e3b82870c7e5cce5188f3f5de311744d1 [diff] | |
| parent | 1a58dce0cc9ae772c0025ecadac1fe3b3a06e1a0 [diff] |
am 1a58dce0: Merge "Add feature definition for Wi-Fi Direct" * commit '1a58dce0cc9ae772c0025ecadac1fe3b3a06e1a0': Add feature definition for Wi-Fi Direct