OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
462fd2f
241be8d
)
am 241be8d5: (-s ours) am 9cae2170: Assign blame for playback wakelocks.
author
Marco Nelissen
<marcone@google.com>
Sat, 26 Oct 2013 22:21:09 +0000
(15:21 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 26 Oct 2013 22:21:09 +0000
(15:21 -0700)
* commit '
241be8d5874023761121043b8709a6062baac6f1
':
Assign blame for playback wakelocks.
Trivial merge