tree 83fe3e2501455b2d4d7ef7cc6b0e1eb2ff39a515
parent 45b1453e02a09830bff7d2bfa47710f4c8106a7a
parent f6a71649ab781be1753ce798bba92a9003fb870f
author Patrick Brady <pbrady@google.com> 1355948316 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355948316 -0800

am f6a71649: am 53abbe78: Updating wifi power profile numbers to more accurately reflect reality. 1. wifi.on set to \'1.38\' to more match the original measurements and more closely match our power testing delta between suspend and wifi-suspend. Note that wifi-suspend

* commit 'f6a71649ab781be1753ce798bba92a9003fb870f':
  Updating wifi power profile numbers to more accurately reflect reality. 1. wifi.on set to '1.38' to more match the original measurements and more closely match our power testing delta between suspend and wifi-suspend. Note that wifi-suspend measurements include some amount of scan and active transmission, so we're setting wifi.on slightly lower. 2. wifi.scan and wifi.active reverted to the earlier configurations which more closely match measured results.