Merge "wifi: Do not use prefix for p2p commands" into klp-dev

author Dmitry Shmidt <dimitrysh@google.com>

Fri, 16 Aug 2013 23:43:25 +0000 (23:43 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 16 Aug 2013 23:45:52 +0000 (23:45 +0000)
author Dmitry Shmidt <dimitrysh@google.com>
Fri, 16 Aug 2013 23:43:25 +0000 (23:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 16 Aug 2013 23:45:52 +0000 (23:45 +0000)
diff --cc wifi/java/android/net/wifi/WifiNative.java
Simple merge
author	Dmitry Shmidt <dimitrysh@google.com>
	Fri, 16 Aug 2013 23:43:25 +0000 (23:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 16 Aug 2013 23:45:52 +0000 (23:45 +0000)