Skip to content
Commit 97f41383 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am fabda589: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 

* commit 'fabda589':
  Need to explicitly disable scan-always when turning off wifi
  Let RemoteControlDisplay know more about playback position
  Unhide MediaExtractor.getPsshInfo()
parents e151d9b3 fabda589
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