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

am c3504304: am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer:... 

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

* commit 'c3504304':
  DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
parents 9044e8cd c3504304
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