tree 43a0e7184071d5b5f08c9387095ac2227e2371f0
parent 65b5a65e790458be0d6f70fafa9e151ba22a9e2e
parent e25a264c4e3739913798d9b7d91af5dc964b0f15
author Dianne Hackborn <hackbod@google.com> 1285027572 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285027572 -0700

am e25a264c: Merge "DO NOT MERGE.  Wifi service now blames apps for its wake lock use." into gingerbread

Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.