| commit | 44bfeb931d53db527c4e7f2ec1d3b7bf0a22aa37 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Sep 20 17:06:12 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 20 17:06:12 2010 -0700 |
| tree | 7d0f7ca035d28794849b31df6f339e41ce6bee2c | |
| parent | 295b9e65f0fdddd9d0895e412e1c524bc0c9b10b [diff] | |
| parent | 2f516cddac639e424313c279703b13494ba7e045 [diff] |
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.