Glenn Kasten
|
498713533b
|
Merge "Fix warning for redundant typedef"
|
2012-01-20 15:06:01 -08:00 |
|
Robert Greenwalt
|
81acea1e17
|
Merge "Stop using shared DUN APN when tethering stops."
|
2012-01-20 14:35:41 -08:00 |
|
Eino-Ville Talvala
|
39d22241e1
|
Merge "Add ANativeWindow timestamp support to camera service."
|
2012-01-20 14:32:22 -08:00 |
|
Robert Greenwalt
|
d1a7460920
|
Merge "Log netd traffic nicely."
|
2012-01-20 14:24:15 -08:00 |
|
Jeff Brown
|
b1ea19c09b
|
Merge "Initialize SQLite as part of the android runtime."
|
2012-01-20 14:07:59 -08:00 |
|
Gilles Debunne
|
43414fbb52
|
Merge "Touch moves cursor in text refactored"
|
2012-01-20 14:06:19 -08:00 |
|
Andreas Huber
|
3b03ffe05e
|
Merge "Starhub RTSP apparently does not establish time on all tracks"
|
2012-01-20 13:43:39 -08:00 |
|
Glenn Kasten
|
8cfd833c3e
|
Merge "Fix typos in string constants"
|
2012-01-20 12:16:06 -08:00 |
|
Glenn Kasten
|
43e5bc529b
|
Merge "Remove dead file include/media/thread_init.h"
|
2012-01-20 12:15:38 -08:00 |
|
Glenn Kasten
|
c7a184d946
|
Merge "Remove redundant get()"
|
2012-01-20 12:14:32 -08:00 |
|
Glenn Kasten
|
2a216a47eb
|
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
|
2012-01-20 11:49:04 -08:00 |
|
Gilles Debunne
|
0c62715893
|
Merge "AOOB in AutoComplete"
|
2012-01-20 10:27:10 -08:00 |
|
Gilles Debunne
|
9341357e77
|
Merge "Make sure text selection always starts"
|
2012-01-20 10:27:00 -08:00 |
|
Glenn Kasten
|
094cf42111
|
Merge "Remove dead setRingerMode(mode, mask)"
|
2012-01-20 10:07:06 -08:00 |
|
Glenn Kasten
|
64dc252ee4
|
Merge "Fix build warning for void * arithmetic"
|
2012-01-20 08:32:45 -08:00 |
|
Pin Ting
|
72982710df
|
Merge "Fixes some javadoc."
|
2012-01-20 01:37:12 -08:00 |
|
Jeff Brown
|
3e43730c22
|
Merge "Don't need to link to libsqlite from media JNI library."
|
2012-01-19 19:54:16 -08:00 |
|
Jeff Brown
|
eaec3d7bae
|
Merge "Clean up SQLiteDebug natives."
|
2012-01-19 19:54:05 -08:00 |
|
Jeff Brown
|
0a2df4995f
|
Merge "Remove custom SQLITE_UNCLOSED error code."
|
2012-01-19 19:53:38 -08:00 |
|
James Dong
|
7e16e907dd
|
Merge "Remove obsolete TODO comments"
|
2012-01-19 18:53:27 -08:00 |
|
Romain Guy
|
9e9942918b
|
Merge "Fix build"
|
2012-01-19 18:16:11 -08:00 |
|
Romain Guy
|
2e47bf1e49
|
Merge "Remove unused code"
|
2012-01-19 17:42:10 -08:00 |
|
Romain Guy
|
644a23677d
|
Merge "Deprecate unused APIs"
|
2012-01-19 17:34:26 -08:00 |
|
Andreas Huber
|
562c9c94ee
|
Merge "Make sure the ThrottledSource reports the proper mime type"
|
2012-01-19 14:40:44 -08:00 |
|
Jeff Brown
|
42d63bdf47
|
Merge "Remove no longer needed EventHub usleep() optimization."
|
2012-01-19 14:19:28 -08:00 |
|
Jeff Brown
|
00e188c986
|
Merge "Fix line wrapping."
|
2012-01-19 14:11:47 -08:00 |
|
Jeff Brown
|
4cebd4acb9
|
Merge "Clean up SQLite debugging code."
|
2012-01-19 14:05:39 -08:00 |
|
Xavier Ducrohet
|
3e71b25e6e
|
Merge "Fix broken drawCircle LayoutLib."
|
2012-01-19 13:17:43 -08:00 |
|
Eric Laurent
|
67398176f1
|
Merge "resolved conflicts for merge of 05683c85 to master"
|
2012-01-19 10:52:46 -08:00 |
|
Gilles Debunne
|
273b8d5c12
|
Merge "Touch slop added to double tap detection"
|
2012-01-19 10:23:32 -08:00 |
|
Gilles Debunne
|
b77ca4509a
|
Merge "Fixes around extract mode"
|
2012-01-19 10:23:18 -08:00 |
|
Teng-Hui Zhu
|
0fa934f97a
|
Merge "Support full screen back to back playing using javascript"
|
2012-01-19 10:00:40 -08:00 |
|
Eric Laurent
|
b64e824cd2
|
resolved conflicts for merge of 05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
|
2012-01-19 10:00:02 -08:00 |
|
Glenn Kasten
|
341cf006a3
|
Merge "Fix incorrect includes of AudioTrack.h"
|
2012-01-19 06:10:37 -08:00 |
|
Glenn Kasten
|
01d2a7ffaa
|
Merge "Simplify range check for audio_mode_t (continued)"
|
2012-01-19 06:09:20 -08:00 |
|
Glenn Kasten
|
00e560c1ef
|
Merge "Add units to time periods"
|
2012-01-19 06:09:05 -08:00 |
|
Glenn Kasten
|
8392e1af2c
|
Merge "Use const const strings for arrays and pointers to strings"
|
2012-01-19 06:08:53 -08:00 |
|
Glenn Kasten
|
23506b664a
|
Merge "For booleans, use ! instead of == false"
|
2012-01-19 06:08:40 -08:00 |
|
Glenn Kasten
|
fb06f08c0a
|
Merge "Replace run-time stream types by compile-time"
|
2012-01-19 06:08:12 -08:00 |
|
Jeff Brown
|
81e215f3df
|
Merge "Fix issues with reentrant SQLite triggers."
|
2012-01-18 18:31:06 -08:00 |
|
Romain Guy
|
f1c2f9a22a
|
Merge "Add basic code required for drawPicture()"
|
2012-01-18 18:14:27 -08:00 |
|
Romain Guy
|
3ed5198bf0
|
Merge "Don't crash on Canvas.drawPicture()"
|
2012-01-18 18:11:09 -08:00 |
|
Romain Guy
|
6c05083234
|
Merge "Full support for Canvas.drawPosText"
|
2012-01-18 18:01:34 -08:00 |
|
Eric Laurent
|
bf927a024b
|
am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
|
2012-01-18 16:08:06 -08:00 |
|
Wink Saville
|
78b9b6f6c6
|
am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
|
2012-01-18 16:08:04 -08:00 |
|
Christopher Tate
|
033c95cdba
|
Merge "Fix edge cases leading to backup hanging forever"
|
2012-01-18 16:07:28 -08:00 |
|
Wink Saville
|
0f467dcc93
|
am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit 'aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
|
2012-01-18 16:05:43 -08:00 |
|
Eric Laurent
|
3571f22afd
|
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
|
2012-01-18 16:05:31 -08:00 |
|
Wink Saville
|
9b4e98aa15
|
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
|
2012-01-18 16:03:24 -08:00 |
|
Stephen Hines
|
f724170dc5
|
Merge "Run ComputePerf multiple times."
|
2012-01-18 15:42:46 -08:00 |
|