summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure thi...Romain Guy2011-11-211-10/+3
|\
| * Hide ManagedEGLContext until we are sure this is the correct API.Romain Guy2011-11-211-10/+3
* | am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-181-0/+4
|\ \ | |/
| * Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-171-0/+4
| |\
| | * GLES: add image external enumsJamie Gennis2011-11-151-0/+4
* | | am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-171-0/+2
|\ \ \ | |/ /
| * | Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-171-0/+2
| |\ \
| | * | Unhide social stream permissions.Dave Santoro2011-11-171-0/+2
* | | | am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-171-4/+4
|\ \ \ \ | |/ / /
| * | | Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-171-4/+4
| |\ \ \
| | * | | Undeprecate LayoutAlgorithmJohn Reck2011-11-161-4/+4
| | | |/ | | |/|
* | | | am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps partic...Dianne Hackborn2011-11-171-3/+10
|\ \ \ \ | |/ / /
| * | | Add new ManagedEGLContext class to help apps participate in memory trimming.Dianne Hackborn2011-11-161-3/+10
| |/ /
* | | am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location informa...James Dong2011-11-111-0/+1
|\ \ \ | |/ /
| * | Merge "Unhide the key to retriever location information in 3gp/mp4 files" int...James Dong2011-11-111-0/+1
| |\ \
| | * | Unhide the key to retriever location information in 3gp/mp4 filesJames Dong2011-11-111-0/+1
* | | | am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs.Narayan Kamath2011-11-111-1/+9
|\ \ \ \ | |/ / /
| * | | Notifiy callers when a speech synthesis error occurs.Narayan Kamath2011-11-111-1/+9
| |/ /
* | | am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlli...Tom Taylor2011-11-101-1/+0
|\ \ \ | |/ /
| * | Revert "Add new secure setting for controlling Messaging notifications"Tom Taylor2011-11-101-1/+0
* | | am 3869eac4: am 114c4d38: Merge "Introduce an API to cancel pending/running s...satok2011-11-101-0/+1
|\ \ \ | |/ /
| * | Merge "Introduce an API to cancel pending/running spell check tasks" into ics...satok2011-11-091-0/+1
| |\ \
| | * | Introduce an API to cancel pending/running spell check taskssatok2011-11-101-0/+1
| | |/
* | | am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Bind...Jeff Brown2011-11-101-0/+5
|\ \ \ | |/ /
| * | Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug:...Jeff Brown2011-11-091-0/+5
| |\ \ | | |/ | |/|
| | * Throw TransactionTooLargeException when Binder transaction fails.Jeff Brown2011-11-081-0/+5
* | | am 7e6c75f5: am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize"...Jamie Gennis2011-11-091-0/+1
|\ \ \ | |/ /
| * | Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1Jamie Gennis2011-11-081-0/+1
| |\ \
| | * | SurfaceTexture: unhide setDefaultBufferSizeJamie Gennis2011-11-041-0/+1
* | | | am 8e2c5113: am b78ae752: Merge "Unhide social stream APIs for Contacts." int...Dave Santoro2011-11-091-0/+58
|\ \ \ \ | |/ / /
| * | | Merge "Unhide social stream APIs for Contacts." into ics-mr1Dave Santoro2011-11-081-0/+58
| |\ \ \ | | |_|/ | |/| |
| | * | Unhide social stream APIs for Contacts.Dave Santoro2011-11-071-0/+58
* | | | am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID,...Matthew Xie2011-11-091-0/+4
|\ \ \ \ | |/ / /
| * | | Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsW...Matthew Xie2011-11-081-0/+4
| |\ \ \
| | * | | Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdpMatthew Xie2011-11-081-0/+4
* | | | | am 068b7f02: am 75b20380: Merge "Making default widget padding public API" in...Adam Cohen2011-11-091-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Making default widget padding public API" into ics-mr1Adam Cohen2011-11-081-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Making default widget padding public APIAdam Cohen2011-11-071-0/+1
* | | | | am 1366c756: Merge "Add new secure setting for controlling Messaging notifica...Tom Taylor2011-11-091-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add new secure setting for controlling Messaging notifications" into i...Tom Taylor2011-11-081-0/+1
| |\ \ \ \
| | * | | | Add new secure setting for controlling Messaging notificationsTom Taylor2011-11-071-0/+1
| | | |/ / | | |/| |
* | | | | am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUui...Ed Heyl2011-11-081-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetch...Ed Heyl2011-11-081-3/+0
* | | | | am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuids...Matthew Xie2011-11-081-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into...Matthew Xie2011-11-071-0/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdpMatthew Xie2011-10-271-0/+3
* | | | | am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible...Adam Powell2011-11-071-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Change the "start deferred" fragment API to "user visible hint"Adam Powell2011-11-071-2/+2
| | |/ / | |/| |
* | | | am eaa17b76: Merge "Add an API for querying / enabling network TTS support." ...Narayan Kamath2011-11-051-0/+4
|\ \ \ \ | |/ / /
| * | | Merge "Add an API for querying / enabling network TTS support." into ics-mr1Narayan Kamath2011-11-041-0/+4
| |\ \ \