OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ede755
8e79dae
)
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
author
Chris Elliott
<chriselliott@google.com>
Wed, 2 Dec 2015 21:57:06 +0000
(21:57 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Dec 2015 21:57:06 +0000
(21:57 +0000)
am:
8e79dae3f6
* commit '
8e79dae3f67aae032010ddbbef2f8032ace01263
':
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Trivial merge