Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'
* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
Revert the channge where channels were not selected randomly.
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp
* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
Revert the channge where channels were not selected randomly.
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Merge commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd'
* commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '770dc6e5890c70af2b176770539d4afd4e904ff5'
* commit '770dc6e5890c70af2b176770539d4afd4e904ff5':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e'
* commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28'
* commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '7fb4e4aaf2137474a6abe0d95888e133d4075527' into eclair-mr2-plus-aosp
* commit '7fb4e4aaf2137474a6abe0d95888e133d4075527':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '492dbe17527e27ba712d185a1eac22ae149c67c0' into eclair-mr2-plus-aosp
* commit '492dbe17527e27ba712d185a1eac22ae149c67c0':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit 'cd79e5e173e00995f072104f7a89cf4015a90efd' into eclair-mr2-plus-aosp
* commit 'cd79e5e173e00995f072104f7a89cf4015a90efd':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7' into eclair-mr2-plus-aosp
* commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2
* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2
* commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-mr2
* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7' into eclair-mr2-plus-aosp
* commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7':
- add javadoc for the account manager
Merge commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067'
* commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067':
don't throw an exception when we can't find a pending sync operation in the database
Merge commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718' into eclair-mr2-plus-aosp
* commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718':
divide mRestoredScale before use
Merge commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9' into eclair-mr2-plus-aosp
* commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9':
don't throw an exception when we can't find a pending sync operation in the database
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2
* commit '5e5eb393729630800079206498f283de8f02f3a7':
don't throw an exception when we can't find a pending sync operation in the database
* changes:
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp
* commit '5de6389f2252cb6e39918e21f80a08918e0c2c02':
DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'
* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
