Merge commit 'd2227277d405fc368c1baf1a80c2d600dca96145' into eclair-plus-aosp
* commit 'd2227277d405fc368c1baf1a80c2d600dca96145':
add searchable dictionary to html docs and dev guide nav
Merge commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3' into eclair
* commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3':
add searchable dictionary to html docs and dev guide nav
Merge commit '56f67d21459ad3f136c73c8932904d4a495989c0' into eclair-plus-aosp
* commit '56f67d21459ad3f136c73c8932904d4a495989c0':
add the ability to specify yieldpoints in a ContentProviderOperation
Merge commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1' into eclair-plus-aosp
* commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1':
Don't mark an APN disabled if setup fails
Merge commit '616195a3b3a50b4f504806cea629af2fe34ae953' into eclair-plus-aosp
* commit '616195a3b3a50b4f504806cea629af2fe34ae953':
MO SMS fail after sending 100 messages
Merge commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf' into eclair-plus-aosp
* commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf':
Remove flaky test LifecycleTest.testDialog from large continuous suite.
Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair
* commit 'e1df82248a68282a4d556ce61db09949fc186827':
Remove flaky test LifecycleTest.testDialog from large continuous suite.
Merge commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59' into eclair-plus-aosp
* commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59':
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
* changes:
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
Merge commit '4b027f128fea32bfcabee55bf4d994400453c00c' into eclair-plus-aosp
* commit '4b027f128fea32bfcabee55bf4d994400453c00c':
Fixes a race condition between entering ERROR state and initial buffer submit.
Merge commit '6f2f790b4c55effb3b75f3418e365dc6663e10be' into eclair-plus-aosp
* commit '6f2f790b4c55effb3b75f3418e365dc6663e10be':
Implement async data/subData. Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh. Update Film to use new builder.
Merge commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50' into eclair-plus-aosp
* commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50':
Armor string format tokens with translation placeholders.
Merge commit '0d430593ee07b78894eff8b78f559d2591a94287' into eclair-plus-aosp
* commit '0d430593ee07b78894eff8b78f559d2591a94287':
Launch synthesis thread at max priority to prevent hicups in playback.
* changes:
Launch synthesis thread at max priority to prevent hicups in playback. Return and log an error when an operation cannot be completed because the speech queue is locked longer than the timeout period. Log cleanup.
Merge commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4' into eclair-plus-aosp
* commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4':
don't layout when setting size from zoom if only height changed
Merge commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496' into eclair-plus-aosp
* commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496':
Only add model in the UA for the release build
Merge commit 'c035f7c79fda9474002d265175fc52692dbd78fe' into eclair-plus-aosp
* commit 'c035f7c79fda9474002d265175fc52692dbd78fe':
Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2' into eclair-plus-aosp
* commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2':
Revert "Remove third party support for Quick Search Box (aka global search)."
Merge commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6' into eclair-plus-aosp
* commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6':
add an accessor for Context for use by subclasses
* Other changes
+ Re-assign err codes in VpnManager.
+ Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
+ Delete the state file only if it exists (to prevent logging an
unable-to-unlink error).
+ Extend timeout to 40 seconds.
Merge commit '1005569fbb459007ff9d9fddbfa6e49947166166' into eclair-plus-aosp
* commit '1005569fbb459007ff9d9fddbfa6e49947166166':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
