OSDN Git Service

am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0
authorJeff Johnson <jjohnson@codeaurora.org>
Wed, 17 Oct 2012 21:13:09 +0000 (14:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Oct 2012 21:13:09 +0000 (14:13 -0700)
* commit '12b1cd9e151d1e5c4d35aa38531f38b4ef5cc805':
  Support conc_pref when use_p2p_group_interface=0


Trivial merge