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.
Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken
* commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab':
Update AudioService to reflect phone state changes with AudioFocus.
Merge commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp
* commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5':
Update AudioService to reflect phone state changes with AudioFocus.
Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken
* commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
Merge commit '25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp
* commit '25dc5f30b2a8276c5790c7152a801fcd905c7281':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.