Merge commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182' into eclair-mr2-plus-aosp * commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182': Code clean up.
Merge commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182' into eclair-mr2-plus-aosp * commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182': Code clean up.