Siva Velusamy
|
dd9dd44c35
|
Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers"
|
2012-01-17 13:47:23 -08:00 |
|
Michael Jurka
|
22dde6d944
|
Merge "Fix bug where recents stopped showing up"
|
2012-01-17 12:53:48 -08:00 |
|
Siva Velusamy
|
34c726efb5
|
gltrace: fixup data for glTexSubImage2D & glDeleteBuffers
Change-Id: I1c1deb8c6026ecf1fa0ed5287ccf601416eba6dc
|
2012-01-17 12:28:11 -08:00 |
|
Fabrice Di Meglio
|
b714a5bf68
|
Merge "Fix bug #5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points"
|
2012-01-17 11:51:22 -08:00 |
|
Glenn Kasten
|
1d2653288f
|
Merge "Use audio_mode_t consistently"
|
2012-01-17 11:32:53 -08:00 |
|
Romain Guy
|
ccb0d762cf
|
Merge "Improve GLES20Canvas clip support"
|
2012-01-17 11:30:22 -08:00 |
|
Glenn Kasten
|
0ebc9501f6
|
Merge "Rename Visualizer::mLock"
|
2012-01-17 11:29:01 -08:00 |
|
Teng-Hui Zhu
|
8ffaf7f3b9
|
Merge "Document update for WebView user to support HTML5 video"
|
2012-01-17 09:06:02 -08:00 |
|
John Reck
|
c27148e490
|
Merge "Expand WebKitHitTest and do some preliminary caching"
|
2012-01-17 09:00:49 -08:00 |
|
Glenn Kasten
|
bc550da6ae
|
Merge "Fix locking for mMasterVolume and mMute"
|
2012-01-17 07:28:14 -08:00 |
|
Glenn Kasten
|
01317c28fc
|
Merge "Use size_t for frame size"
|
2012-01-17 07:27:46 -08:00 |
|
Glenn Kasten
|
b8105e3392
|
Merge "Use audio_stream_type_t consistently"
|
2012-01-17 07:25:36 -08:00 |
|
Glenn Kasten
|
6447aa80a9
|
Merge "Add android.os.Process.setThreadScheduler"
|
2012-01-17 07:20:47 -08:00 |
|
Glenn Kasten
|
380cdee43b
|
Merge "AudioTrack and AudioFlinger send level cleanup"
|
2012-01-17 07:18:26 -08:00 |
|
Scott Main
|
5b941c3233
|
am 2afcd2d1: am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '2afcd2d1a29f4417425630916e1ab93aa383cf1e':
docs: emphasize qualifier order and mention implicit version qualifer
|
2012-01-13 18:27:45 -08:00 |
|
Scott Main
|
2b4332646c
|
am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '3938e4fbaae132db9b4676ba26f6b3c042a6879e':
docs: emphasize qualifier order and mention implicit version qualifer
|
2012-01-13 18:25:44 -08:00 |
|
Scott Main
|
e0edc5b7b7
|
am 114875e8: am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '114875e837163e1029536439ec3891bc2582acf2':
docs: mention x86 as a native platform filter
|
2012-01-13 18:25:34 -08:00 |
|
Dianne Hackborn
|
8d9c020188
|
am d4d68fe2: am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit 'd4d68fe20259e2d6aaae8bc4a38b360aa0b57081':
Update notification documentation to follow current guidelines.
|
2012-01-13 18:25:31 -08:00 |
|
Daniel Sandler
|
aefd164bfa
|
am 80c4cd1f: am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '80c4cd1fd7d44fcacbff7d4903ce227eb3add1e3':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
|
2012-01-13 18:25:28 -08:00 |
|
Scott Main
|
37a79cfbec
|
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
|
2012-01-13 18:23:40 -08:00 |
|
Scott Main
|
3d66c69643
|
am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
|
2012-01-13 18:23:35 -08:00 |
|
Dianne Hackborn
|
1f7dba4b26
|
am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
|
2012-01-13 18:23:34 -08:00 |
|
Daniel Sandler
|
f176920175
|
am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit 'bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
|
2012-01-13 18:23:33 -08:00 |
|
Scott Main
|
3d3293b131
|
Merge "docs: mention x86 as a native platform filter" into ics-mr1
|
2012-01-13 18:21:42 -08:00 |
|
Irfan Sheriff
|
5098fcce97
|
Merge "cleanup for concurrency"
|
2012-01-13 16:41:41 -08:00 |
|
Dianne Hackborn
|
55f960feb3
|
Merge "Update notification documentation to follow current guidelines." into ics-mr1
|
2012-01-13 16:36:05 -08:00 |
|
Michael Kolb
|
6168fe00b1
|
Merge "fix layer scrollbar updates"
|
2012-01-13 16:25:14 -08:00 |
|
The Android Automerger
|
9eb6f85cb5
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-13 16:18:17 -08:00 |
|
Jeff Sharkey
|
1be47191a0
|
Merge "Introduce FileRotator."
|
2012-01-13 15:33:42 -08:00 |
|
Jeff Brown
|
fcc24a5b4d
|
Merge "Fix compilation with Clang."
|
2012-01-13 15:16:59 -08:00 |
|
Jeff Brown
|
43f0a8a1b1
|
Merge "Fix a few memory leaks in the input dispatcher."
|
2012-01-13 15:16:29 -08:00 |
|
Gilles Debunne
|
80ec198c44
|
Merge "Sub display list in TextView"
|
2012-01-13 14:53:54 -08:00 |
|
David 'Digit' Turner
|
91e6d9c64d
|
Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
|
2012-01-13 14:32:50 -08:00 |
|
Stephen Hines
|
76fb659abe
|
Merge "Add support for new root.expand() calls."
|
2012-01-13 13:57:24 -08:00 |
|
Glenn Kasten
|
1db13d7951
|
Get AID_GRAPHICS from right place
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
|
2012-01-13 13:45:39 -08:00 |
|
Kenny Root
|
eb051e35e9
|
resolved conflicts for merge of e80341c8 to master
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
|
2012-01-13 13:39:28 -08:00 |
|
Kenny Root
|
575f408150
|
am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
|
2012-01-13 13:12:34 -08:00 |
|
Kenny Root
|
f39fc5a881
|
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
|
2012-01-13 13:11:02 -08:00 |
|
Dianne Hackborn
|
fc37fe6c27
|
am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '100651779fde99f7ae2a10719d688b51115f08e9':
Fix issue #5823276: home repaints after full-screen app is exited
|
2012-01-13 13:01:48 -08:00 |
|
Dianne Hackborn
|
3d9e6137a8
|
am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #5823276: home repaints after full-screen app is exited
|
2012-01-13 12:58:45 -08:00 |
|
Dianne Hackborn
|
6393739ea4
|
Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
|
2012-01-13 12:56:40 -08:00 |
|
Bart Sears
|
77e747afe0
|
am bcce2a19: am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
Update to latest version of Roboto
|
2012-01-13 12:37:53 -08:00 |
|
Bart Sears
|
3339f65a39
|
am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
|
2012-01-13 12:35:07 -08:00 |
|
Bart Sears
|
0667548a8a
|
Merge "Update to latest version of Roboto" into ics-mr1
|
2012-01-13 12:32:43 -08:00 |
|
Christopher Tate
|
79691d284b
|
am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '89620c5d982858f590f3740169c9f69ee380be3e':
Streamline package-installed handling by the Backup Manager
|
2012-01-13 12:18:55 -08:00 |
|
Romain Guy
|
0e57869f58
|
Merge "Remove unused parameter"
|
2012-01-13 12:13:52 -08:00 |
|
Christopher Tate
|
125fb9efd9
|
am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
|
2012-01-13 12:08:09 -08:00 |
|
Christopher Tate
|
cab5000317
|
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
|
2012-01-13 11:49:20 -08:00 |
|
John Huang
|
f008476558
|
am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit 'e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
Fix teardown of secondary connections on CDMA
|
2012-01-13 11:41:01 -08:00 |
|
John Huang
|
29c2558465
|
am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
|
2012-01-13 11:39:03 -08:00 |
|