summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am c56944ed: am ebda92b8: Merge "Track libcore cleanup."Elliott Hughes2013-05-111-2/+2
|\
| * am ebda92b8: Merge "Track libcore cleanup."Elliott Hughes2013-05-111-2/+2
| |\
| | * Track libcore cleanup.Elliott Hughes2013-05-101-2/+2
* | | am 9a763630: am 37dbac9c: Merge "Expose @SafeVarargs."Elliott Hughes2013-05-101-0/+3
|\ \ \ | |/ /
| * | am 37dbac9c: Merge "Expose @SafeVarargs."Elliott Hughes2013-05-101-0/+3
| |\ \ | | |/
| | * Expose @SafeVarargs.Elliott Hughes2013-05-101-0/+3
* | | am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connec...Jeff Brown2013-05-101-0/+1
|\ \ \ | |/ /
| * | am 9766caed: Merge "Add an API to determine if a route is connecting." into j...Jeff Brown2013-05-101-0/+1
| |\ \
| | * \ Merge "Add an API to determine if a route is connecting." into jb-mr2-devJeff Brown2013-05-101-0/+1
| | |\ \
| | | * | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-0/+1
* | | | | am e6abfd96: am d702e48c: Merge "Expose AutoCloseable."Conley Owens2013-05-101-13/+18
|\ \ \ \ \ | |/ / / /
| * | | | am d702e48c: Merge "Expose AutoCloseable."Conley Owens2013-05-101-13/+18
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Expose AutoCloseable.Elliott Hughes2013-05-101-13/+18
* | | | am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-m...Marco Nelissen2013-05-101-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Add VideoView.getAudioSessionId()" into jb-mr2-devMarco Nelissen2013-05-101-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Add VideoView.getAudioSessionId()Marco Nelissen2013-05-091-0/+2
* | | | am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request ac...Jeff Brown2013-05-091-0/+3
|\ \ \ \ | |/ / /
| * | | Add an API to allow a callback to request active scans.Jeff Brown2013-05-091-0/+3
| |/ /
* | | Navigation hideybar via new system ui opt-in flag.John Spurlock2013-05-081-0/+1
* | | New UndoManager.Dianne Hackborn2013-05-071-0/+55
* | | resolved conflicts for merge of 78df7b5e to masterJesse Hall2013-05-061-1/+9
|\ \ \ | |/ /
| * | Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-devJesse Hall2013-05-041-1/+9
| |\ \
| | * | Add android.opengl.EGLExt class for EGL extensionsJesse Hall2013-05-011-1/+9
* | | | am b0675df8: am faa47b52: Merge "Idle maintenance scheduling broken." into jb...Svetoslav2013-05-061-2/+0
|\ \ \ \ | |/ / /
| * | | Idle maintenance scheduling broken.Svetoslav2013-05-031-2/+0
* | | | Merge "Unhide extra to fix docs build."Jeff Sharkey2013-05-021-0/+1
|\ \ \ \
| * | | | Unhide extra to fix docs build.Jeff Sharkey2013-05-011-0/+1
* | | | | Merge "Start fleshing out new storage APIs."Jeff Sharkey2013-05-021-0/+25
|\ \ \ \ \ | |/ / / /
| * | | | Start fleshing out new storage APIs.Jeff Sharkey2013-05-011-0/+25
* | | | | am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle e...Jeff Tinker2013-05-011-6/+18
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-011-6/+18
| |\ \ \ | | |/ / | |/| |
| | * | MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-301-6/+18
* | | | Remove obsolete OMA-DRM supportMike Lockwood2013-04-291-3/+3
* | | | Decorate AssetFileDescriptor with Closeable.Jeff Sharkey2013-04-291-1/+1
* | | | am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-251-1/+0
|\ \ \ \ | |/ / /
| * | | Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-261-1/+0
| |\ \ \
| | * | | Hide isLinkedUser()Amith Yamasani2013-04-251-1/+0
* | | | | am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
| |\ \ \ \
| | * | | | Fix build.Daniel Sandler2013-04-251-1/+1
* | | | | | am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-m...Daniel Sandler2013-04-251-8/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "API cleanup: NotificationListener" into jb-mr2-devDaniel Sandler2013-04-251-8/+7
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | API cleanup: NotificationListenerDaniel Sandler2013-04-251-8/+7
* | | | | am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotif...Daniel Sandler2013-04-251-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-devDaniel Sandler2013-04-251-0/+1
| |\ \ \ \ | | |/ / /
| | * | | New NotificationListener API: getActiveNotifications()Daniel Sandler2013-04-241-0/+1
* | | | | am 269c068d: am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no vis...Amith Yamasani2013-04-251-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.Amith Yamasani2013-04-241-1/+0
| |/ / /
* | | | am 2e0a94d2: am b442d074: Merge "Add hardware feature android.hardware.blueto...Matthew Xie2013-04-231-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-devMatthew Xie2013-04-231-0/+1
| |\ \ \