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

Browse Source

* commit 'fabda5894c2793b37650ce3bc1697effd86af88b':
  Need to explicitly disable scan-always when turning off wifi
  Let RemoteControlDisplay know more about playback position
  Unhide MediaExtractor.getPsshInfo()

...

This commit is contained in:

The Android Open Source Project

2013-06-12 07:25:57 -07:00

committed by Android Git Automerger

parent e151d9b3c7 fabda5894c

commit 97f41383eb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available