OSDN Git Service

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


Trivial merge