Commits
The Android Open Source Project authored and Android Git Automerger committed 97f41383eb2M
am fabda589: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'fabda5894c2793b37650ce3bc1697effd86af88b': Need to explicitly disable scan-always when turning off wifi Let RemoteControlDisplay know more about playback position Unhide MediaExtractor.getPsshInfo()
Showing diff toe151d9b3c72