am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable...
am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit '92a420eb':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.