summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late...Scott Main2012-06-282-3/+3
|\
| * Merge "Minor corrections to the javadoc overview to reflect late API changes....Scott Main2012-06-282-3/+3
| |\
| | * Minor corrections to the javadoc overview to reflect late API changes.Andreas Huber2012-06-272-3/+3
* | | am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directo...Mike Lockwood2012-06-261-4/+4
|\ \ \ | |/ /
| * | Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" i...Mike Lockwood2012-06-261-4/+4
| |\ \ | | |/ | |/|
| | * MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletesMike Lockwood2012-06-261-4/+4
* | | am c8c5e98b: Merge "Document some of the more common mimetypes to be used whe...Andreas Huber2012-06-251-0/+16
|\ \ \ | |/ /
| * | Document some of the more common mimetypes to be used when instantiatingAndreas Huber2012-06-251-0/+16
| |/
* | am dbbfa702: Fix MediaRouter bugsAdam Powell2012-06-241-1/+2
|\ \ | |/
| * Fix MediaRouter bugsAdam Powell2012-06-241-1/+2
* | am fd3fd482: Merge "Update route count properly when MediaRouteButton detects...Adam Powell2012-06-231-2/+2
|\ \ | |/
| * Update route count properly when MediaRouteButton detectsAdam Powell2012-06-221-2/+2
* | am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-devAdam Powell2012-06-211-1/+32
|\ \ | |/
| * MediaRouter group volume reportingAdam Powell2012-06-201-1/+32
* | am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-4/+192
|\ \ | |/
| * Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-4/+192
| |\
| | * Expand volume APIs for MediaRouterAdam Powell2012-06-201-4/+192
* | | am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-devPannag Sanketi2012-06-201-3/+12
|\ \ \ | |/ /
| * | Merge "Crash in SurfaceTextureTarget filter open" into jb-devPannag Sanketi2012-06-201-3/+12
| |\ \ | | |/ | |/|
| | * Crash in SurfaceTextureTarget filter openPannag Sanketi2012-06-201-3/+12
* | | am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote pl...Jean-Michel Trivi2012-06-201-16/+0
|\ \ \ | |/ /
| * | Unhide new API in android.media.MediaRouter for remote playbackJean-Michel Trivi2012-06-201-16/+0
* | | am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-devJean-Michel Trivi2012-06-202-8/+30
|\ \ \ | |/ /
| * | Asynchronous handling of remote volume updatesJean-Michel Trivi2012-06-202-8/+30
* | | am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-devJean-Michel Trivi2012-06-205-26/+350
|\ \ \ | |/ /
| * | Remote volume handling in MediaRouterJean-Michel Trivi2012-06-195-26/+350
| |/
* | am 2f442304: Merge "Remote volume handling" into jb-devJean-Michel Trivi2012-06-194-33/+733
|\ \ | |/
| * Merge "Remote volume handling" into jb-devJean-Michel Trivi2012-06-194-33/+733
| |\
| | * Remote volume handlingJean-Michel Trivi2012-06-184-33/+733
* | | am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-devAdam Powell2012-06-182-6/+19
|\ \ \ | |/ /
| * | MediaRouter bluetooth a2dp selectionAdam Powell2012-06-182-6/+19
* | | am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-devAdam Powell2012-06-181-0/+1
|\ \ \ | |/ /
| * | Restrict MediaRouter selectionAdam Powell2012-06-181-0/+1
| |/
* | am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-devAdam Powell2012-06-181-0/+17
|\ \ | |/
| * Volume control in MediaRouter dialogsAdam Powell2012-06-161-0/+17
* | am 706a8699: Merge "Make MediaRouter UI more robust around route count change...Adam Powell2012-06-181-22/+10
|\ \ | |/
| * Make MediaRouter UI more robust around route count changesAdam Powell2012-06-161-22/+10
* | am 130b4572: ActionProvider API updateAdam Powell2012-06-181-1/+1
|\ \ | |/
| * ActionProvider API updateAdam Powell2012-06-151-1/+1
* | am 87959cdd: Merge "Add new callback for MediaRouter to found out about devic...Dianne Hackborn2012-06-186-83/+267
|\ \ | |/
| * Merge "Add new callback for MediaRouter to found out about device changes." i...Dianne Hackborn2012-06-156-83/+267
| |\
| | * Add new callback for MediaRouter to found out about device changes.Dianne Hackborn2012-06-156-83/+267
* | | am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-devEric Laurent2012-06-181-26/+9
|\ \ \ | |/ /
| * | Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-devEric Laurent2012-06-151-26/+9
| |\ \ | | |/ | |/|
| | * AudioManager: back to old setBluetoothA2dpOn()Eric Laurent2012-06-151-26/+9
* | | am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-devAdam Powell2012-06-151-25/+33
|\ \ \ | |/ /
| * | Update MediaRouteChooserDialog grouping UIAdam Powell2012-06-151-25/+33
* | | am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-141-21/+103
|\ \ \ | |/ /
| * | API updates for MediaRouterAdam Powell2012-06-141-21/+103
| |/
* | am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." int...Adam Powell2012-06-141-10/+63
|\ \ | |/