tree c7b05d643cc92c3d95324a02a256f28ab8c5c88c
parent f1b7188187968e37abf9e4ac2e82c4ab08577d2a
parent 12b1cd9e151d1e5c4d35aa38531f38b4ef5cc805
author Jeff Johnson <jjohnson@codeaurora.org> 1350508389 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350508389 -0700

am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0

* commit '12b1cd9e151d1e5c4d35aa38531f38b4ef5cc805':
  Support conc_pref when use_p2p_group_interface=0