| commit | c4a5cff339b2a2a205082143d4f693f272023ab6 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Sep 20 19:33:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 20 19:33:50 2010 -0700 |
| tree | ec4e1fe7ceb1ade1ee4dde94bac31bca50cb04cb | |
| parent | c88dea4958c4ed950d9ed2f374636359613fd3a9 [diff] | |
| parent | 44bfeb931d53db527c4e7f2ec1d3b7bf0a22aa37 [diff] |
am 0ce12e21: (-s ours) am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread Merge commit '0ce12e210eaef554e96752af2553dadc431d6d09' * commit '0ce12e210eaef554e96752af2553dadc431d6d09': DO NOT MERGE. Wifi service now blames apps for its wake lock use.