Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp * commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f': moved the hidden sync helpers out of the framework
Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp * commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f': moved the hidden sync helpers out of the framework