Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken
* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
Only include WEB_EDIT if there are more textfields.
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp
* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
Only include WEB_EDIT if there are more textfields.
Merge commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec' into kraken
* commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec':
Make sure when WebView modified mScrollX/Y directly,
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp
* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
Make sure when WebView modified mScrollX/Y directly,
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken
* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp
* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '0f7c543cc48d287591b5638a15bf8ca977e162a2' into kraken
* commit '0f7c543cc48d287591b5638a15bf8ca977e162a2':
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Merge commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866' into froyo-plus-aosp
* commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866':
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken
* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp
* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken
* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
Dont start wifi if in airplane mode
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp
* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
Dont start wifi if in airplane mode
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken
* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
Support another kind of iso mpeg4 file.
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp
* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
Support another kind of iso mpeg4 file.
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken
* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
revert the stripping of System Group:
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp
* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
Make desk mode work again.
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp
* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
revert the stripping of System Group:
Merge commit 'f5071884809219edb420a4f7c4a0eef9523d7bca' into kraken
* commit 'f5071884809219edb420a4f7c4a0eef9523d7bca':
Add test annotations to frameworks common tests.
Merge commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp
* commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192':
Add test annotations to frameworks common tests.