tree 59c83f7b96274c9415b89f98f94d1c087a2790f5
parent 4bc69bd18e68bf33b6e235ca482286e8467978ac
parent f61bfdb31eea34f90db88907e32e2b49fe18264c
author Irfan Sheriff <isheriff@google.com> 1339713047 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339713047 -0700

am f61bfdb3: Merge "More wifi direct CTS tests" into jb-dev

* commit 'f61bfdb31eea34f90db88907e32e2b49fe18264c':
  More wifi direct CTS tests