OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ba3192 4ef1dc2)
am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
authorEric Laurent <elaurent@google.com>
Mon, 27 Jan 2014 19:20:16 +0000 (11:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 19:20:16 +0000 (11:20 -0800)
* commit '4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d':
  Only increase the counter when we do take a wakelock


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