am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 -...
am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '67bb6741'
* commit '67bb6741':
DO NOT MERGE Fix bug 3124899 - timeout in CTS test