commit | de0f98ea9916b78abda39441a1229193f6977025 | [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 | 5cad5df9654a84b937c545c85830d0a7c8fd2efd | |
parent | 760a5b7b8f1a91ea2fa3cb6a30b954327fbbcf8e [diff] | |
parent | 67bb6741965c0b9f3bf6b4caf2647efc564e287e [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