OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 295b9e6 2f516cd)
am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock...
authorDianne Hackborn <hackbod@google.com>
Tue, 21 Sep 2010 00:06:12 +0000 (17:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Sep 2010 00:06:12 +0000 (17:06 -0700)
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

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


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help