commit | d3abf6a4aab07d959eb05b716196015faa87e941 | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Mon Oct 25 12:13:56 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 25 12:13:56 2010 -0700 |
tree | c1de301e59289ee9ac3fa95516624c3c03ce507c | |
parent | 92d5f0b1910b9cbce3d10aeebe2ea83526620c60 [diff] | |
parent | 0b3b01a6098ec4d1353d7ade49360ffe4e1a3f88 [diff] |
am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread Merge commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e' * commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e': DO NOT MERGE Fix bug 3124899 - timeout in CTS test