summaryrefslogtreecommitdiffstats
path: root/api/current.txt
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 0a43f67e to masterChris Wren2012-06-211-0/+3
|\
| * am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into...Daniel Sandler2012-06-211-0/+4
| |\
| | * Merge "Unhide new methods on RemoteViews and Notification." into jb-devDaniel Sandler2012-06-211-0/+4
| | |\
| | | * Unhide new methods on RemoteViews and Notification.Daniel Sandler2012-06-211-0/+4
* | | | am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-0/+4
|\ \ \ \ | |/ / /
| * | | am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-0/+4
| |\ \ \ | | |/ /
| | * | Expand volume APIs for MediaRouterAdam Powell2012-06-201-0/+4
* | | | am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter ...Jean-Michel Trivi2012-06-201-0/+21
|\ \ \ \ | |/ / /
| * | | am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote pl...Jean-Michel Trivi2012-06-201-0/+21
| |\ \ \ | | |/ /
| | * | Unhide new API in android.media.MediaRouter for remote playbackJean-Michel Trivi2012-06-201-0/+21
* | | | Fix build; un-pin attribute destined for API 17 or later to preventAdam Powell2012-06-191-8/+8
* | | | am da828803: am 2dde147b: Merge "Add an XML attribute for controlling which r...Adam Powell2012-06-191-0/+1
|\ \ \ \ | |/ / /
| * | | am 2dde147b: Merge "Add an XML attribute for controlling which route types a ...Adam Powell2012-06-191-0/+1
| |\ \ \ | | |/ /
| | * | Add an XML attribute for controlling which route types aAdam Powell2012-06-191-0/+1
* | | | Clean up PowerManager API.Jeff Brown2012-06-191-2/+2
* | | | am 45c4a8df: am ec7c7ebf: Merge "API for finding accessibility focus in virtu...Svetoslav Ganov2012-06-181-1/+0
|\ \ \ \ | |/ / /
| * | | am ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not n...Svetoslav Ganov2012-06-181-1/+0
| |\ \ \ | | |/ /
| | * | Merge "API for finding accessibility focus in virtual tree not needed." into ...Svetoslav Ganov2012-06-181-1/+0
| | |\ \ | | | |/ | | |/|
| | | * API for finding accessibility focus in virtual tree not needed.Svetoslav Ganov2012-06-171-1/+0
* | | | am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into ...Adam Powell2012-06-181-0/+1
|\ \ \ \ | |/ / /
| * | | am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-devAdam Powell2012-06-181-0/+1
| |\ \ \ | | |/ /
| | * | Volume control in MediaRouter dialogsAdam Powell2012-06-161-0/+1
* | | | am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route...Adam Powell2012-06-181-0/+6
|\ \ \ \ | |/ / /
| * | | am 706a8699: Merge "Make MediaRouter UI more robust around route count change...Adam Powell2012-06-181-0/+6
| |\ \ \ | | |/ /
| | * | Make MediaRouter UI more robust around route count changesAdam Powell2012-06-161-0/+6
* | | | am df6d3eeb: am c4637d3e: Merge "Allow restricting the scope of a phone-filte...Makoto Onuki2012-06-181-0/+2
|\ \ \ \ | |/ / /
| * | | am c4637d3e: Merge "Allow restricting the scope of a phone-filter search" int...Makoto Onuki2012-06-181-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Allow restricting the scope of a phone-filter search" into jb-devMakoto Onuki2012-06-161-0/+2
| | |\ \ | | | |/ | | |/|
| | | * Allow restricting the scope of a phone-filter searchDaniel Lehmann2012-06-151-0/+2
* | | | am bb20575f: am 130b4572: ActionProvider API updateAdam Powell2012-06-181-0/+2
|\ \ \ \ | |/ / /
| * | | am 130b4572: ActionProvider API updateAdam Powell2012-06-181-0/+2
| |\ \ \ | | |/ /
| | * | ActionProvider API updateAdam Powell2012-06-151-0/+2
| | |/
* | | am 11832db4: am 531d5866: Merge "Accessibility focus search and setting it fr...Svetoslav Ganov2012-06-181-8/+0
|\ \ \ | |/ /
| * | am 531d5866: Merge "Accessibility focus search and setting it from hover are ...Svetoslav Ganov2012-06-181-8/+0
| |\ \ | | |/
| | * Merge "Accessibility focus search and setting it from hover are performed by ...Svetoslav Ganov2012-06-151-8/+0
| | |\
| | | * Accessibility focus search and setting it from hover are performed by the cli...Svetoslav Ganov2012-06-151-8/+0
* | | | am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" ...Adam Powell2012-06-151-2/+2
|\ \ \ \ | |/ / /
| * | | am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-devAdam Powell2012-06-151-2/+2
| |\ \ \ | | |/ /
| | * | Update MediaRouteChooserDialog grouping UIAdam Powell2012-06-151-2/+2
* | | | am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-141-2/+7
|\ \ \ \ | |/ / /
| * | | am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-141-2/+7
| |\ \ \ | | |/ /
| | * | Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-141-2/+7
| | |\ \ | | | |/ | | |/|
| | | * API updates for MediaRouterAdam Powell2012-06-141-2/+7
* | | | am fc959a38: am 9e197141: Merge "Add new ASSIST key and map it to the global ...Jeff Brown2012-06-141-0/+1
|\ \ \ \ | |/ / /
| * | | am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent...Jeff Brown2012-06-141-0/+1
| |\ \ \ | | |/ /
| | * | Merge "Add new ASSIST key and map it to the global assist intent." into jb-devJeff Brown2012-06-141-0/+1
| | |\ \ | | | |/ | | |/|
| | | * Add new ASSIST key and map it to the global assist intent.Jeff Brown2012-06-141-0/+1
* | | | am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-devAdam Powell2012-06-141-0/+3
|\ \ \ \ | |/ / /
| * | | am 4b4a947b: Merge "MediaRouter dialog" into jb-devAdam Powell2012-06-131-0/+3
| |\ \ \ | | |/ /
| | * | MediaRouter dialogAdam Powell2012-06-131-0/+3
| | |/