OSDN Git Service

Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into ginge...
authorDianne Hackborn <hackbod@google.com>
Tue, 21 Sep 2010 00:03:15 +0000 (17:03 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Sep 2010 00:03:15 +0000 (17:03 -0700)
commit2f516cddac639e424313c279703b13494ba7e045
tree4abaee0d4995d4967c87db0e03f818f74c65c605
parent64735001351ddb8545f1e470747410729a20cded
parent1f6bf40676a182ca67d5479f055decea5522bde9
Merge "DO NOT MERGE.  Wifi service now blames apps for its wake lock use." into gingerbread