tree c7b05d643cc92c3d95324a02a256f28ab8c5c88c
parent f5a0f76b8b8e3e1fbca2c57cceaa464df7f904ac
parent c9330050e31b548cf2df57b77cdf2ceb7b0d70ec
author Jeff Johnson <jjohnson@codeaurora.org> 1350508690 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350508690 -0700

am c9330050: am a44422be: am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0

* commit 'c9330050e31b548cf2df57b77cdf2ceb7b0d70ec':
  Support conc_pref when use_p2p_group_interface=0