Jason Sams
d2e84538cb
Merge "Beging IO stream out from allocation to surface texture."
2012-02-15 12:05:26 -08:00
Gilles Debunne
3ef8d80ee4
Merge "Invalidate display list on alpha change"
2012-02-15 10:23:18 -08:00
Robert Greenwalt
e120c1a39c
am 1b2583c4: am 7874efeb: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit '1b2583c41c37c055821d8f4ebbdc717f108c3b48':
Stop using shared DUN APN when tethering stops.
2012-02-15 07:53:53 -08:00
Robert Greenwalt
359ccfaff4
am 7a08ef44: am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit '7a08ef442ad6138352785690a8e341607d763399':
Add a config to set Dun capabilities.
2012-02-15 07:53:51 -08:00
Justin Ho
dac0a7569c
am d9a19ffa: am e6ccc94e: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'd9a19ffa1f4f1a9554a40c7944eddf63f0800edd':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-15 07:53:47 -08:00
Steven Ross
47f4ed7e49
Merge "Removing dependence on enable_facelock"
2012-02-15 03:29:57 -08:00
Michael Jurka
a57656c5a7
Merge "Fix recents on crespo"
2012-02-14 23:26:49 -08:00
Jeff Brown
98d5b362d7
Merge "Add support for posting Runnables to the Choreographer."
2012-02-14 19:41:32 -08:00
Jeff Brown
ad8d2d43a3
Merge "Add a barrier mechanism to the MessageQueue."
2012-02-14 19:41:22 -08:00
Svetoslav Ganov
fe5bcb58d4
Merge "Incorrect behavior of View clear focus v2.0."
2012-02-14 19:09:54 -08:00
Mathias Agopian
3ac9473cb9
Merge "Don't wrap EGLImageKHR and EGLSyncKHR anymore"
2012-02-14 18:59:47 -08:00
Mathias Agopian
7c0441ac27
Don't wrap EGLImageKHR and EGLSyncKHR anymore
...
this simplify our EGL wrapper implementation a lot.
This wrapping is no longer needed now that we can only
support a single underlaying EGL implementation.
Change-Id: I8213df7ac69daac447f1fe6e37044b78aac4e9a9
2012-02-14 17:14:36 -08:00
Jeff Brown
94d0070b96
Merge "Clean up InputChannel file descriptor data type."
2012-02-14 17:11:41 -08:00
Romain Guy
4176e1c874
Merge "Clarify documentation of Bitmap.createScaledBitmap/createBitmap Bug #6015472 "
2012-02-14 16:55:55 -08:00
Siva Velusamy
fefddbc181
Merge "gltrace: Patch up all glUniform*() calls."
2012-02-14 16:36:44 -08:00
Jamie Gennis
1eea29f48d
Merge "Refactored query function from SurfaceTexture into BufferQueue"
2012-02-14 16:29:02 -08:00
Robert Greenwalt
3f4ae9ba33
am 7874efeb: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit '7874efeb138204230475720d0b97f2d199a21502':
Stop using shared DUN APN when tethering stops.
2012-02-14 16:25:11 -08:00
Robert Greenwalt
90ebe73f02
am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit 'e3776a47dbebc8195edeac39f7f4ce3e08b59bec':
Add a config to set Dun capabilities.
2012-02-14 16:25:09 -08:00
Justin Ho
bef300dd83
am e6ccc94e: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'e6ccc94ef9825360d8993553b30dcaa0f342c871':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 16:25:08 -08:00
Amith Yamasani
76d5cf4bf8
Merge "Mixed up uid and user-id."
2012-02-14 16:12:27 -08:00
Jeff Brown
9491e81ff6
Clean up InputChannel file descriptor data type.
...
File descriptors are ints.
Change-Id: Ie36733bf36ddfeaa9a09ef6ebd7bd2f1788f5d27
2012-02-14 15:57:59 -08:00
Chris Craik
80bcc4ac50
Merge "disable webkit paint pausing"
2012-02-14 15:56:08 -08:00
Eric Fischer
37de75fa01
Merge "Import translations."
2012-02-14 15:52:50 -08:00
Amith Yamasani
c9a9282f48
Merge "Revert "Incorrect behavior of View clear focus.""
2012-02-14 15:52:17 -08:00
Gilles Debunne
afe9fa9ec3
Merge "Display list invalidated on hint text change"
2012-02-14 15:48:04 -08:00
Irfan Sheriff
f94a6784c6
Merge "Initial support for concurrency"
2012-02-14 15:37:07 -08:00
Omari Stephens
62aaa1ff95
Merge "Add a method to the smoke test that launches each app"
2012-02-14 15:18:58 -08:00
Siva Velusamy
88e8e5a3f1
gltrace: Patch up all glUniform*() calls.
...
This patch updates the trace information for all glUniform*() calls
to have the right data (the actual uniforms that are passed).
In addition, as soon as a program is linked, information regarding
all the active attributes and uniforms is passed on to the debugger.
Change-Id: Icfbc6722789b42c413a845cf546577fa6de7da2b
2012-02-14 15:08:20 -08:00
Michael Jurka
fc1ded8476
Merge "Fix the build"
2012-02-14 14:56:21 -08:00
Fabrice Di Meglio
e0a3b686b6
Merge "Make textDirection API public"
2012-02-14 14:45:51 -08:00
Gilles Debunne
bd36b2b0f7
Merge "Minor typo fixes"
2012-02-14 14:41:15 -08:00
The Android Automerger
282ce65def
merge in ics-mr1-release history after reset to ics-mr1
2012-02-14 14:15:44 -08:00
Michael Jurka
0df1911693
Merge "Making recents faster"
2012-02-14 13:57:14 -08:00
Robert Greenwalt
fd8d6c3d5f
am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
2012-02-14 13:41:47 -08:00
Robert Greenwalt
e4f6a70a41
am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
2012-02-14 13:39:55 -08:00
Robert Greenwalt
c5696c721a
am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
2012-02-14 13:39:53 -08:00
Robert Greenwalt
abc7387e26
am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
2012-02-14 13:39:25 -08:00
Stephen Hines
a36d13b389
Merge "Fix typos/spacing with new APIs."
2012-02-14 13:38:43 -08:00
Robert Greenwalt
34297ab3a2
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
2012-02-14 13:38:15 -08:00
Robert Greenwalt
b34f2b22a3
Merge "Add a config to set Dun capabilities." into ics-mr1
2012-02-14 13:37:44 -08:00
Stephen Hines
e8f4b3ced4
Merge "Initialize all class members."
2012-02-14 13:35:21 -08:00
Justin Ho
37eb849a1c
am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 13:31:28 -08:00
Justin Ho
3386c8d680
am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 13:31:00 -08:00
Joe Fernandez
f1c2aba8d3
am c9f1eb20: am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit 'c9f1eb20033d50dadbe028985bedc5022c50ce4c':
2012-02-14 13:30:50 -08:00
Mike Lockwood
c21756fc12
am ac7ab269: am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit 'ac7ab269e5a8c3d25ac243efcc92cc791002e6b9':
2012-02-14 13:30:47 -08:00
John Wang
0068060026
am 71bece56: am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '71bece56377896f4799a6d480c459c4344050e64':
2012-02-14 13:30:46 -08:00
Justin Ho
cfcb3a71aa
Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
2012-02-14 13:29:08 -08:00
Joe Fernandez
0b288fe888
am 08851a53: am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit '08851a53a147a4022a37fb61ba17fd2876d2afc5':
docs: Android NDK r7b Release Notes
2012-02-14 13:08:04 -08:00
Mike Lockwood
85151b484d
am 8f7cc7af: am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit '8f7cc7af66520e3bd5e59e8eadb6907e3e043661':
Don't pulse LED on new notification unless notification has LED flag set
2012-02-14 13:08:01 -08:00
John Wang
00ca8b281b
am 0b17fc36: am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '0b17fc360185ca7b9d05a096b0033ddd8d883940':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
2012-02-14 13:07:58 -08:00