Dianne Hackborn
8346fa498a
am 264e7277: am 934516e1: Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
...
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f'
* commit '264e727775728d0478fcb95855e8ea3801f34c8f':
Fix issue #2999795 : Runtime restart on Crespo
2010-09-15 11:38:02 -07:00
Brad Fitzpatrick
898171bbd3
am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
...
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'
* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
Unify some duplicate StrictMode-enabling code.
2010-09-15 11:37:54 -07:00
Brad Fitzpatrick
03b02e1d88
am 79cc46d1: am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
...
Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'
* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
Add missing wallpaper service lock.
2010-09-15 11:37:46 -07:00
Romain Guy
04c64dc3e5
am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
...
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'
* commit '282315e154b63a2eec84609600c81ad9e1c72994':
Change the keep alive time for excess idle threads.
2010-09-15 11:37:37 -07:00
Brian Carlstrom
6bd6d21962
am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
...
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'
* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-15 11:37:22 -07:00
Brian Carlstrom
7ea18cf23e
am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
...
Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773'
* commit '0535d8577fb2a3687428f462c591ae3220e1f773':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-15 11:36:58 -07:00
Daisuke Miyakawa
5f58195ad8
Merge "Take apart LocalePicker#onListItemClick() into two"
2010-09-15 10:54:42 -07:00
Jean-Baptiste Queru
18be7e2b79
Merge "Manage fonts like a true product definition"
2010-09-15 09:53:00 -07:00
Nipun Kwatra
38cdce629c
Merge "Disable shutter sound and play recording sound for still mode time lapse."
2010-09-15 09:18:30 -07:00
Leon Scroggins
7f710d0151
Merge "Exit action mode when destroying the WebView or loading."
2010-09-15 08:47:57 -07:00
Irfan Sheriff
4d66069f0f
Merge "Add per network static IP settings"
2010-09-15 08:31:03 -07:00
John Wang
825577f81b
am e92fdd26: am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
...
Merge commit 'e92fdd261eed516a8821675ceca971d1c90d772b'
* commit 'e92fdd261eed516a8821675ceca971d1c90d772b':
Return immutable copies of private callList.
2010-09-15 07:09:00 -07:00
Leon Scroggins III
859c074c02
am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'
* commit '720d5985f5d31912c97b7e549230d241e58c1298':
Add an option to hide the Voice Search icon.
2010-09-15 07:08:49 -07:00
Hung-ying Tyan
d0def4800f
am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
...
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'
* commit '188a8f1b72452bc294daa2186e93771543be0478':
SipService: ignore connect event for non-active networks.
2010-09-15 07:08:38 -07:00
Dirk Dougherty
39f77068e7
am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
...
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'
* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
Doc change: update ADT 0.9.8 checksum and size.
2010-09-15 07:08:23 -07:00
Kenny Root
be42f39a04
am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
...
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'
* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
Dedupe timestamp in PackageSettings
2010-09-15 07:08:15 -07:00
Hung-ying Tyan
48d9424e81
am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
...
Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'
* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-15 07:08:04 -07:00
Hung-ying Tyan
3d4315b7f1
am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip
...
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'
* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
SIP: remove dependency on javax.sip
2010-09-15 07:07:56 -07:00
Chung-yih Wang
86fd95efc4
am 316e72cb: am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
...
Merge commit '316e72cb05637735c67ae02911dd0dbe096c71f5'
* commit '316e72cb05637735c67ae02911dd0dbe096c71f5':
Fix the bug of authentication in an outgoing call.
2010-09-15 07:07:47 -07:00
Jaikumar Ganesh
b03b3c6778
am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
...
Merge commit 'b390728b54805ecba3e0690edf2b83b60933e6a7'
* commit 'b390728b54805ecba3e0690edf2b83b60933e6a7':
Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-15 07:07:38 -07:00
Hung-ying Tyan
fa1cec901a
am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
...
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'
* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
SipService: deliver connectivity change to all sessions.
2010-09-15 07:07:19 -07:00
Nipun Kwatra
6cff3123d4
Merge "Added command type to play recording sound."
2010-09-14 17:48:02 -07:00
Vasu Nori
433a2af7e2
Merge "fix bugs in exception throwing code in native_fillwindow"
2010-09-14 16:40:24 -07:00
Vasu Nori
5fdec887ce
Merge "change TAG value from "Cursor" to "SQLiteCursor""
2010-09-14 16:04:26 -07:00
Jason Sams
64e113cb0c
Merge "Fix partial NP2 support and restrict mipmaps and clamp modes on HW that does not support proper NP2 bug 2965170"
2010-09-14 16:02:02 -07:00
Jaikumar Ganesh
7da40628e2
Merge "Rework Bluetooth tethering networking configuration."
2010-09-14 15:27:47 -07:00
Nipun Kwatra
2db10d6697
Merge "Adding enable/disable option for sendCommand()"
2010-09-14 15:15:16 -07:00
Adam Powell
f31bcfd4db
Merge "Improve ListView smooth scrolling timing"
2010-09-14 15:14:56 -07:00
Vasu Nori
9505d4d868
Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5"
2010-09-14 13:37:57 -07:00
Shimeng (Simon) Wang
bae67c69c7
Merge "Fix comment."
2010-09-14 13:37:37 -07:00
Jean-Baptiste Queru
8bb35e99d2
Merge "Manage fonts like a true product definition"
2010-09-14 13:17:18 -07:00
Dianne Hackborn
991abcb98a
am 934516e1: Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
...
Merge commit '934516e10150874fd1db5ab9e0be3ae793441fd8' into gingerbread-plus-aosp
* commit '934516e10150874fd1db5ab9e0be3ae793441fd8':
Fix issue #2999795 : Runtime restart on Crespo
2010-09-14 11:54:28 -07:00
Dianne Hackborn
a667ca867a
Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
2010-09-14 11:50:51 -07:00
Brad Fitzpatrick
08df773b12
am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
...
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp
* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
Unify some duplicate StrictMode-enabling code.
2010-09-14 11:39:54 -07:00
Alex Sakhartchouk
2ac4ace15e
Merge "Shader changes to allow for more flexible constant binding."
2010-09-14 11:39:53 -07:00
Brad Fitzpatrick
553270cc55
am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
...
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp
* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
Add missing wallpaper service lock.
2010-09-14 11:39:43 -07:00
Brad Fitzpatrick
52b649f02a
Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
2010-09-14 11:37:13 -07:00
Brad Fitzpatrick
e10c4c56e7
Merge "Add missing wallpaper service lock." into gingerbread
2010-09-14 11:37:05 -07:00
Romain Guy
60e96a56b4
am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
...
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp
* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
Change the keep alive time for excess idle threads.
2010-09-14 11:36:55 -07:00
Romain Guy
8f8715a1e3
Merge "Change the keep alive time for excess idle threads." into gingerbread
2010-09-14 11:34:01 -07:00
Brian Carlstrom
fe9f855c4e
am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
...
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp
* commit '405d4db50b3db1fc5e015475218e190d193332d4':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
4128f7c02b
am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
...
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp
* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Brian Carlstrom
e565df9d96
Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
2010-09-14 11:15:01 -07:00
Maksymilian Osowski
be161d1f02
Merge "Changed Summarizer to add header before printing the path in summary.txt and details.html"
2010-09-14 10:37:46 -07:00
John Wang
5b86c15a4b
am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
...
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp
* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
Return immutable copies of private callList.
2010-09-14 10:31:45 -07:00
John Wang
db608bd7d0
Merge "Return immutable copies of private callList." into gingerbread
2010-09-14 10:28:33 -07:00
Leon Scroggins III
e95f395c15
am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp
* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
efe02e796b
am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread
* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Steve Block
b14bddabe6
Merge "Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2"
2010-09-14 10:21:30 -07:00
Leon Scroggins III
b0d30a12a0
Merge "Add an option to hide the Voice Search icon." into froyo
2010-09-14 10:21:25 -07:00