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 '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.
Merge commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp
* commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
* changes:
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
Refer to 3GPP Spec 31.102 for more details.
We read and parse USIM records instead of the RIL doing it for us.
We only support reading of USIM Phonebook records.
Merge commit '3f402cbbd25b04d4869cc78586e68c4806eb21ee'
* commit '3f402cbbd25b04d4869cc78586e68c4806eb21ee':
Add a test case to measure the power usage of loading a web page
Merge commit '19d6f7ac27448b59c936878756bad49f623a6a99' into eclair-plus-aosp
* commit '19d6f7ac27448b59c936878756bad49f623a6a99':
Add a test case to measure the power usage of loading a web page
This is accomplished by adding hasIccCard to ITelephony and do
the implemenation in PhoneInterfaceManager.java. Then change
TelephonyManager to use getITelephony().hasIccCard().
Change-Id: I26970fdf92a058502b8156a4f52c14e213217fc6
Merge commit 'acab17f02a0a94eb72a7a69456d9485ce2ff8dc3'
* commit 'acab17f02a0a94eb72a7a69456d9485ce2ff8dc3':
Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b' into eclair-plus-aosp
* commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b':
Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '5e5288410702ea426c401be19e9221f63532cfe8'
* commit '5e5288410702ea426c401be19e9221f63532cfe8':
When encountering a .nomedia file, notify the MediaScannerClient,
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp
* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
When encountering a .nomedia file, notify the MediaScannerClient,
* changes:
When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
Merge commit '7eb63ba5666ce470e4d99164965a28dc63e681f6'
* commit '7eb63ba5666ce470e4d99164965a28dc63e681f6':
Attach the title bar to the top of the page.
Merge commit '015897709182be40eb5e9aee19e9ef396738a33e'
* commit '015897709182be40eb5e9aee19e9ef396738a33e':
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Merge commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67' into eclair-plus-aosp
* commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67':
Attach the title bar to the top of the page.
