commit 2e1b836cf04851f704ce2b2eae7f39fc6f363bd1
author Jean-Baptiste Queru <jbq@google.com> Mon Jul 30 11:16:32 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 30 11:16:32 2012 -0700
tree 8878f16562ac5980793a213340b9263403e0166e
parent 769e4f862a0f1ac3d0e83c9ffd2e7f835f42195d
parent 6c76dfa70ef63873b7f0b53deb32c9e740314aa1

am 6c76dfa7: Use default handling of board-info.txt

* commit '6c76dfa70ef63873b7f0b53deb32c9e740314aa1':
  Use default handling of board-info.txt

kernel

diff --git a/kernel b/kernel
index ac548dc..d395f79 100644
--- a/kernel
+++ b/kernel
Binary files differ

overlay/frameworks/base/core/res/res/xml/power_profile.xml

diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 58fd374..0391e0c 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -33,7 +33,7 @@
       -->
   <item name="wifi.on">2.9</item>
   <item name="wifi.active">31.0</item>
-  <item name="wifi.scan">6.5</item>
+  <item name="wifi.scan">100</item>
   <item name="dsp.audio">14.1</item>
   <item name="dsp.video">54.0</item>
   <item name="gps.on">29.7</item>

overlay/packages/apps/Settings/res/values/bools.xml

diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
index a9049d7..32fce50 100644
--- a/overlay/packages/apps/Settings/res/values/bools.xml
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -17,4 +17,6 @@
 <resources>
     <!-- No powercontrol widget for tablets -->
     <bool name="has_powercontrol_widget">true</bool>
+    <!-- Enable user management -->
+    <bool name="enable_user_management">true</bool>
 </resources>