Jean-Baptiste Queru
873a3772a7
Merge "telephony: Fix CID when CID is unknown"
2010-05-05 13:15:24 -07:00
Jean-Michel Trivi
061b1d2ea1
am 99fb5046: am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
2010-05-05 12:08:31 -07:00
Jean-Michel Trivi
090ae596a7
am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
...
Merge commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346' into kraken
* commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346':
Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:06:12 -07:00
James Dong
a41541967c
am 0835f067: Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken
2010-05-05 12:04:45 -07:00
Jean-Michel Trivi
96bbb9e978
am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
...
Merge commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp
* commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:03:43 -07:00
Jean-Michel Trivi
e4e1811a2e
Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn't fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
2010-05-05 12:02:18 -07:00
James Dong
894c2f39d5
Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken
2010-05-05 11:40:51 -07:00
Jean-Baptiste Queru
26b8da8361
Merge "Call register_localized_collators() with the current locale."
2010-05-05 11:16:31 -07:00
Scott Main
3c21dd8dc8
am 26dfbb67: am 9aa12f85: am a69e10db: fix doc bug in hello gallery tutorial
2010-05-05 09:31:40 -07:00
Scott Main
ced32b826c
am 9aa12f85: am a69e10db: fix doc bug in hello gallery tutorial
...
Merge commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394' into kraken
* commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394':
fix doc bug in hello gallery tutorial
2010-05-05 09:29:39 -07:00
Scott Main
3e56175a45
am a69e10db: fix doc bug in hello gallery tutorial
...
Merge commit 'a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp
* commit 'a69e10db2fb58deb5e27aa67c46d267af928374b':
fix doc bug in hello gallery tutorial
2010-05-05 09:27:50 -07:00
Dianne Hackborn
3ac792b4c3
Merge "Set alpha value for newly created dim surface."
2010-05-04 23:58:26 -07:00
Dianne Hackborn
d00c9826e2
am d9d009d7: am 3445dae3: am 65b2561c: Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
2010-05-04 22:20:16 -07:00
Bjorn Bringert
ecb8e1138e
am b6179a70: am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
2010-05-04 22:20:12 -07:00
Dianne Hackborn
5a1693c626
am 3445dae3: am 65b2561c: Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
...
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken
* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
Fix issue #2643754 : Launcher is caching widget layouts for too long
2010-05-04 18:30:51 -07:00
Bjorn Bringert
630ff135a4
am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
...
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken
* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
Build searchables list after boot
2010-05-04 18:30:47 -07:00
Dianne Hackborn
ec2d0323cf
am 65b2561c: Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
...
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp
* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
Fix issue #2643754 : Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Bjorn Bringert
930ee51fae
am c9dc1090: Merge "Build searchables list after boot" into froyo
...
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp
* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
Build searchables list after boot
2010-05-04 18:22:36 -07:00
Dianne Hackborn
25932b1088
Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
2010-05-04 17:43:25 -07:00
Bjorn Bringert
f442576ecf
Merge "Build searchables list after boot" into froyo
2010-05-04 16:57:56 -07:00
Scott Main
5d3219ad0d
am 51867f23: am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
2010-05-04 16:08:42 -07:00
Scott Main
f3847f9b76
am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
...
Merge commit '0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken
* commit '0915d0aa9c13b365d48c6868ac47913ecd172d07':
docs: resolve doc bug
2010-05-04 16:06:57 -07:00
Scott Main
c224e59822
am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
...
Merge commit '5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp
* commit '5e5202bd6f9e7687fc6399762529b0ef5625e515':
docs: resolve doc bug
2010-05-04 16:04:46 -07:00
Scott Main
d11ab7456a
Merge "docs: resolve doc bug bug:2648699" into froyo
2010-05-04 16:03:37 -07:00
Jaikumar Ganesh
b042a3dc18
am c0cec624: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state.
2010-05-04 15:57:45 -07:00
Jaikumar Ganesh
ecbf23177f
am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
2010-05-04 15:55:02 -07:00
Jaikumar Ganesh
dea9058c55
Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
2010-05-04 15:53:31 -07:00
Adam Powell
ded72527d5
am 37f4f5b1: am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:43:14 -07:00
Adam Powell
69993124b0
am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
...
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken
* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:41:41 -07:00
Adam Powell
2b349fac4d
am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
...
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp
* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
Jaikumar Ganesh
4f08a9af66
am 55b0110f: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state.
2010-05-04 15:31:16 -07:00
Jean-Baptiste Queru
b7719a307a
Merge "Fix for bug 2467152 files with spaces fail to open."
2010-05-04 15:16:32 -07:00
James Dong
5b626ec40c
am 8d30b2d2: Merge "Support AAC recording" into kraken
2010-05-04 14:52:57 -07:00
Andreas Huber
9085e649ac
am ce0bd717: am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
2010-05-04 14:52:47 -07:00
Scott Main
d038dd3e92
am ebad36db: am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
2010-05-04 14:52:43 -07:00
James Dong
a6ae071ee1
Merge "Support AAC recording" into kraken
2010-05-04 14:40:28 -07:00
Andreas Huber
80637684aa
am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
...
Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken
* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
2010-05-04 14:30:34 -07:00
Andreas Huber
e7f1b6dd9c
am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
...
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp
* commit 'e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
2010-05-04 14:29:04 -07:00
Andreas Huber
fe8bcd9c8a
Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
2010-05-04 14:27:26 -07:00
Scott Main
c2e89d246e
am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
...
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken
* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
docs: revise and add documentation for backup APIs
2010-05-04 14:22:47 -07:00
Scott Main
46016a24eb
am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
...
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp
* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
Scott Main
69c8c1c8db
Merge "docs: revise and add documentation for backup APIs" into froyo
2010-05-04 14:20:02 -07:00
Daniel Sandler
20d6ada4b5
am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 12:55:03 -07:00
Dan Morrill
1021f0ecaf
am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
2010-05-04 12:54:58 -07:00
Joe Onorato
e2c394f4f0
am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
2010-05-04 12:54:54 -07:00
Daniel Sandler
3adf5f2abf
am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
...
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken
* commit '342a3800b9b31929b337d298a24184d820f27f26':
Increase the row height of menus by 1dip.
2010-05-04 12:45:53 -07:00
Dan Morrill
2243017061
am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
...
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken
* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:45:49 -07:00
Joe Onorato
25ab836708
am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
...
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken
* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
Call into app widget hosts when the provider is updated.
2010-05-04 12:45:44 -07:00
Daniel Sandler
f27cbc7bed
am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
...
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp
* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
Increase the row height of menus by 1dip.
2010-05-04 12:42:48 -07:00
Daniel Sandler
2da986fbd2
Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 12:40:54 -07:00