OSDN Git Service

am 0fb73406: am 0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
authorMike J. Chen <mjchen@google.com>
Fri, 7 Dec 2012 07:21:31 +0000 (23:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Dec 2012 07:21:31 +0000 (23:21 -0800)
* commit '0fb734060951ad2513680f2d9f9013ff68c2772e':
  Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support


Trivial merge