Skip to content
Commit c3504304 authored by Sridhar Vashist's avatar Sridhar Vashist Committed by Android Git Automerger
Browse files

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.
parents 31f01e2f 92a420eb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment