Merge commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4' into eclair-mr2-plus-aosp * commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4': Make the RegisteredSErvices Cache not allow the registered service for a
Merge commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4' into eclair-mr2-plus-aosp * commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4': Make the RegisteredSErvices Cache not allow the registered service for a