am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test...
am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '17efcde1' into gingerbread-plus-aosp
* commit '17efcde1':
DO NOT MERGE Fix bug 3124899 - timeout in CTS test