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)

Trivial merge