diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-12 07:25:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-12 07:25:57 -0700 |
| commit | 97f41383eb2bb098767ca153e470009fea810540 (patch) | |
| tree | 709b143d9ebdd54e48a47beadf61f851e91a98e8 /include | |
| parent | e151d9b3c728a242b1a244ec8e36556c246eb4b0 (diff) | |
| parent | fabda5894c2793b37650ce3bc1697effd86af88b (diff) | |
| download | frameworks_base-97f41383eb2bb098767ca153e470009fea810540.zip frameworks_base-97f41383eb2bb098767ca153e470009fea810540.tar.gz frameworks_base-97f41383eb2bb098767ca153e470009fea810540.tar.bz2 | |
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()
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions