tree d38eadf8aff9de577264aebd522953d7a28a4489
parent 70fd8a038c4b825f7585881cb26c68db516ad77a
parent 0fb734060951ad2513680f2d9f9013ff68c2772e
author Mike J. Chen <mjchen@google.com> 1354864891 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354864891 -0800

am 0fb73406: am 0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support

* commit '0fb734060951ad2513680f2d9f9013ff68c2772e':
  Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support