tree 88f8aa5a73fd9cc07b26dfb638019dea31014a97
parent 177b05d6140cb0fb25fa75a61b888cf53f44564e
parent 17efcde161cbcbc0d98bf809036c5e640497f001
author Adam Powell <adamp@google.com> 1288033671 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288033671 -0700

am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread

Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test