Merge commit '3d031d2a19900474501650d555628fa3baf2b314'
* commit '3d031d2a19900474501650d555628fa3baf2b314':
Translate the content dimension to the view space before setting them to the view.
Merge commit '267e621468516e4e5da82707f8a2d84ada164131'
* commit '267e621468516e4e5da82707f8a2d84ada164131':
NotificationManagerService: Only blink red battery low LED when not charging.
Merge commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b'
* commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b':
Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
Merge commit '1cdacef021bdea80fcb40c72dd8efa7fe718debe'
* commit '1cdacef021bdea80fcb40c72dd8efa7fe718debe':
do not merge: fix API current.xml for Hashtable.
Merge commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7'
* commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7':
do not merge: update API for Josh's optimizations for Eclair
Merge commit 'da32be5e06b9f02d0113b072de79276e16d19f50'
* commit 'da32be5e06b9f02d0113b072de79276e16d19f50':
Removing references to deprecated API and the deprecated API itself.
Merge commit '0e5e77ce11b9d0f7d4ce0a2a9d92fce203793271'
* commit '0e5e77ce11b9d0f7d4ce0a2a9d92fce203793271':
Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
Merge commit '82534558bdf3e2c37391662195cfe9a144e38076'
* commit '82534558bdf3e2c37391662195cfe9a144e38076':
Allow hasIccCard to be useable by any processes.
Merge commit '2d666c4cbe488551a3c049b314c703371c73f468'
* commit '2d666c4cbe488551a3c049b314c703371c73f468':
Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
Merge commit 'e5b6d02f34af2cd81615653b00c96a421d5ea819' into eclair-plus-aosp
* commit 'e5b6d02f34af2cd81615653b00c96a421d5ea819':
Translate the content dimension to the view space before setting them to the view.
Merge commit '445f43081e207ee704a5152a5333054d7b4e13a4' into eclair-plus-aosp
* commit '445f43081e207ee704a5152a5333054d7b4e13a4':
NotificationManagerService: Only blink red battery low LED when not charging.
Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp
* commit '34619494e009d998f5c073145c0481e38bbd2bcf':
Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
Merge commit 'f163f7f0f29f0898eb82f54cf657cb34668abade' into eclair-plus-aosp
* commit 'f163f7f0f29f0898eb82f54cf657cb34668abade':
do not merge: fix API current.xml for Hashtable.
Merge commit '6de753bffe47e796942272692869992f62f8f0ab' into eclair-plus-aosp
* commit '6de753bffe47e796942272692869992f62f8f0ab':
do not merge: update API for Josh's optimizations for Eclair
Merge commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06' into eclair-plus-aosp
* commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06':
Removing references to deprecated API and the deprecated API itself.
Merge commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp
* commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8':
Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
Merge commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435' into eclair-plus-aosp
* commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435':
Allow hasIccCard to be useable by any processes.
Merge commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2' into eclair-plus-aosp
* commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2':
Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
Merge commit 'a980fce64fba1df71e1e0d7ed60391bf9825a1bb'
* commit 'a980fce64fba1df71e1e0d7ed60391bf9825a1bb':
Implement USIM and add support for importing emails from USIM.
Merge commit '7c599e0288fb4ad9d393467458f59c45638d04ec' into eclair-plus-aosp
* commit '7c599e0288fb4ad9d393467458f59c45638d04ec':
Implement USIM and add support for importing emails from USIM.
Merge commit 'b7677205fa5a8d85336959dc0188467b6e98e857'
* commit 'b7677205fa5a8d85336959dc0188467b6e98e857':
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Merge commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9' into eclair-plus-aosp
* commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9':
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Merge commit '0aca78bf9c68fbdd2863403127837bacb557e91a'
* commit '0aca78bf9c68fbdd2863403127837bacb557e91a':
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
