Merge commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp
* commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
Fix issue #2608292: Fails to launch the video camera preview
Merge commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f' into kraken
* commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f':
Fix error code when media is filled up.
Merge commit 'a2a568e58d77848471a2f1d9ab6df2cbb2c916d6' into froyo-plus-aosp
* commit 'a2a568e58d77848471a2f1d9ab6df2cbb2c916d6':
Fix error code when media is filled up.
Merge commit '986a038030ab57bd36a6eb630da1773b33dfb30b' into kraken
* commit '986a038030ab57bd36a6eb630da1773b33dfb30b':
Remove the WebTextView if it is drawing when it shouldn't.
Merge commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42' into froyo-plus-aosp
* commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42':
Remove the WebTextView if it is drawing when it shouldn't.
Merge commit '627728d26c81ce7a3ee2f784036cfe0c4e5ef899' into kraken
* commit '627728d26c81ce7a3ee2f784036cfe0c4e5ef899':
Added the subset of partial content support so that
Merge commit '88bfceae1ab6de010b49e8c497ed2a363d6fa79a' into kraken
* commit '88bfceae1ab6de010b49e8c497ed2a363d6fa79a':
SDK: new 'bmgr' docs in the Dev Guide
Merge commit 'b42b5a6edb08d198caf567acfc0a318547d8be73' into kraken
* commit 'b42b5a6edb08d198caf567acfc0a318547d8be73':
Post a message to set SurfaceView to be visible when
Merge commit 'a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7' into froyo-plus-aosp
* commit 'a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7':
Added the subset of partial content support so that
Merge commit '75a537051de4220d32e8aa72348909757fa11e5d' into froyo-plus-aosp
* commit '75a537051de4220d32e8aa72348909757fa11e5d':
SDK: new 'bmgr' docs in the Dev Guide
Merge commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp
* commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
Post a message to set SurfaceView to be visible when
get rid of the "fake rtti" code, and use polymorphism instead.
also simplify how we log SF's state (using polymorphism)
Change-Id: I2bae7c98de4dd207a3e2b00083fa3fde7c467922
Merge commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken
* commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411':
Fix security hole in Google backup transport registration
Merge commit '36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp
* commit '36fa47139d4621dc4bf8d89caa8650495d901b00':
Fix security hole in Google backup transport registration
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken
* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
Add title to recent apps dialog.
Merge commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp
* commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
Add title to recent apps dialog.
Merge commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken
* commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14':
Allow META* macros outside of the framework
Fix printing order of phone objects creation
Merge commit '172673cd5b21dee6e175ab67235aa19bc2689868' into kraken
* commit '172673cd5b21dee6e175ab67235aa19bc2689868':
DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
Merge commit '83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp
* commit '83512d4dfc06137bc2d9db0cb62644c54f41a771':
DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
Merge commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8' into kraken
* commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8':
Fix PM crash due to bad array bookkeeping logic.
Merge commit '22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp
* commit '22caecda8a24c971972d78a112279c48f242d529':
Fix PM crash due to bad array bookkeeping logic.
Merge commit '9127d9a5fd95d7454a10d44acb79079720f6bb91' into kraken
* commit '9127d9a5fd95d7454a10d44acb79079720f6bb91':
Move Tethering off the ServerThread.
Merge commit 'be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp
* commit 'be34896457bb37b4e263efa87316d2e2420adab3':
Move Tethering off the ServerThread.
Merge commit '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken
* commit '89e28cbefaff6ae9499032bb446ae7e72e019466':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Merge commit '9e609b0dfa155fbe8ba3b5abd4faa188e2270dde' into froyo-plus-aosp
* commit '9e609b0dfa155fbe8ba3b5abd4faa188e2270dde':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
