OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ec5145 087d30c)
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property....
authorChris Elliott <chriselliott@google.com>
Wed, 2 Dec 2015 22:46:11 +0000 (22:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Dec 2015 22:46:11 +0000 (22:46 +0000)
commita6ed5dcd044fdeec84b42472cb393ddf9315a0ae
treeea946674ac235e253c63ab225023a19bdb1ca225tree | snapshot
parent5ec51457e1b899c3b85f480862851e9ff04f9f2fcommit | diff
parent087d30c14243f38c28793877b8e5ad12d3a2b269commit | diff
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6
am: 087d30c142

* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
media/java/android/media/MediaPlayer.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help