commit 2553ce98d86678fc39328df126e4333ff99dfcdc
author The Android Automerger <android-build@android.com> Tue Apr 30 05:55:49 2013 -0700
committer The Android Automerger <android-build@android.com> Tue Apr 30 05:55:49 2013 -0700
tree 23464a806cf9ca294ba499ccdaddcad73302018c
parent a2e79fae23c5d5178ec7c534bd488eacc5d098ec
parent 0f04d2d2b2d7d58fdc11615fe52cca40344e50ee

merge in jb-mr2-release history after reset to jb-mr2-dev

overlay/frameworks/base/core/res/res/values/config.xml

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 11a9c5a..5667103 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -43,7 +43,6 @@
         <item>"mobile_hipri,5,0,3,60000,true"</item>
         <item>"mobile_bluetooth,7,7,1,-1,true"</item>
         <item>"ethernet,9,9,1,-1,true"</item>
-        <item>"wifi_p2p,13,1,0,-1,true"</item>
     </string-array>
 
     <!-- An Array of "[ConnectivityManager connectionType],