Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp * commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea': javadoc change: fix the selector sample XML in the class
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp * commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea': javadoc change: fix the selector sample XML in the class