[automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours
am:dd6df6a38f-s ours am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1a070aaa88fis in history Change-Id: I45912237edf2f485e6e747c7b4878eb440096f18
This commit is contained in: