tree f199173c6f29558140dabd270582a3ebb3ec3ecd
parent d35019220f1bbc0766a383d9502bcab956dec20c
parent 0cc49e8db007f71888bf706420edfc530cf4fbff
author Mike J. Chen <mjchen@google.com> 1354849094 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354849094 -0800

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

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