Merge commit '8776ed1029c196607ef9fb31d9629666759826f5'
* commit '8776ed1029c196607ef9fb31d9629666759826f5':
add searchable dictionary to html docs and dev guide nav
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 '9b52ad61642c84f74c89627eeb28d03ebb44386c'
* commit '9b52ad61642c84f74c89627eeb28d03ebb44386c':
add the ability to specify yieldpoints in a ContentProviderOperation
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
We need to leave the phone in a connectable state so that it connects whenever it's able
(reception or just timing). If we mark it disabled on failure it wont try again. The retry
comes from the phone layer, not from ConnectivityService.
Also Fix the Phone layer so it retries even if it disconnected by request (DATA_DISABLED).
This was a bug from long ago that didn't become visible until recently with fast wifi and slow
mobile teardown.
Change-Id: I04bf39fba0cb578c87d5fc6ea5d220820ff9f364
Merge commit '616195a3b3a50b4f504806cea629af2fe34ae953' into eclair-plus-aosp
* commit '616195a3b3a50b4f504806cea629af2fe34ae953':
MO SMS fail after sending 100 messages
Merge commit 'df857eb8004bbd6ec4b1aa12e2ac5d71cb866755'
* commit 'df857eb8004bbd6ec4b1aa12e2ac5d71cb866755':
Remove flaky test LifecycleTest.testDialog from large continuous suite.
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 '932cb5507ec2e4249bafb9fa792e37dfa7629412'
* commit '932cb5507ec2e4249bafb9fa792e37dfa7629412':
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
Merge commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59' into eclair-plus-aosp
* commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59':
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
Merge commit 'b32be296d099bb32b3c0ba4140945ed018f14438'
* commit 'b32be296d099bb32b3c0ba4140945ed018f14438':
Fixes a race condition between entering ERROR state and initial buffer submit.
* 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 'd76566bd950fc3f60edda9a3047dfbc3c489caa7'
* commit 'd76566bd950fc3f60edda9a3047dfbc3c489caa7':
Implement async data/subData. Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh. Update Film to use new builder.
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.
