164eb050bd
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp * commit '4f170821678099010ec593d2b5a081e0f8adf92d': Fix typo and bug in CTS test class.