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

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

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

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