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 |
|
Adam Powell
|
947a9a0fd5
|
am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
|
2012-01-18 14:51:35 -08:00 |
|
Adam Powell
|
589629d2de
|
am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
|
2012-01-18 14:49:30 -08:00 |
|
Adam Powell
|
9d40d1e8d0
|
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
|
2012-01-18 14:47:20 -08:00 |
|
Jeff Brown
|
8377e5905a
|
Merge "Improve heuristics for orientation detection."
|
2012-01-18 14:43:16 -08:00 |
|
Michael Kolb
|
b86560dfb1
|
Merge "Prevent IME from popping up on startup"
|
2012-01-18 14:00:52 -08:00 |
|
Robert Ly
|
93ddcfd785
|
am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit 'c891c6eff7ab320092af4ec5b235f83866f66261':
docs: adding rs api docs
|
2012-01-18 13:21:54 -08:00 |
|
Robert Ly
|
ee537418cf
|
am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
update overview page for rs api docs to open iframe links in parent
|
2012-01-18 13:21:51 -08:00 |
|
Robert Ly
|
3d515c3a2e
|
am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
|
2012-01-18 13:19:52 -08:00 |
|
Robert Ly
|
75aa7310ea
|
am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
|
2012-01-18 13:19:50 -08:00 |
|
Robert Ly
|
103e20348e
|
Merge "docs: adding rs api docs" into ics-mr1
|
2012-01-18 13:18:11 -08:00 |
|
Robert Ly
|
140608dd28
|
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
|
2012-01-18 13:17:51 -08:00 |
|
Martijn Coenen
|
5144ffd264
|
Merge "Remove LlcpPacket from public namespace."
|
2012-01-18 13:09:55 -08:00 |
|
Joe Fernandez
|
66558b5989
|
am 58f9c3da: am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '58f9c3da340eb36051bc20d6b8cec6b982852ee0':
docs: Android API 15 SDK r2 Release Notes
|
2012-01-18 12:37:22 -08:00 |
|
Joe Fernandez
|
629e3a4885
|
am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
|
2012-01-18 12:35:30 -08:00 |
|
Joe Fernandez
|
617d0b0488
|
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
|
2012-01-18 12:33:45 -08:00 |
|
Andreas Huber
|
b457eff8f3
|
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
|
2012-01-18 11:01:00 -08:00 |
|
Andreas Huber
|
e75d488d20
|
Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
|
2012-01-18 09:29:56 -08:00 |
|
Bryan Mawhinney
|
9644a67eab
|
Merge "Make sure seek triggers a reconnect if needed."
|
2012-01-18 08:58:19 -08:00 |
|
Glenn Kasten
|
628a011e2b
|
Merge "Track volume cleanup"
|
2012-01-18 07:46:18 -08:00 |
|
Romain Guy
|
b202c1b9e3
|
Merge "First pass at implementing Canvas.drawPosText() in GL"
|
2012-01-17 17:40:24 -08:00 |
|
Eric Laurent
|
e2f3dccf37
|
Merge "audio framework: manage stream volume per device"
|
2012-01-17 17:35:03 -08:00 |
|
Romain Guy
|
6843f2593c
|
Merge "Free optimization"
|
2012-01-17 17:33:15 -08:00 |
|
Svetoslav Ganov
|
09f7079073
|
Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."
|
2012-01-17 17:25:56 -08:00 |
|
Tadashi G. Takaoka
|
dfdf4124d1
|
Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions"
|
2012-01-17 16:57:56 -08:00 |
|