commit | 5ccc4553ac7bde1f6249cd7e1635f26dbc3a4ac1 | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@google.com> | Mon Apr 18 03:26:12 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 18 03:26:12 2011 -0700 |
tree | 3045b63502ad75ca7006151cfd0f79d449b77670 | |
parent | 05dde7f454340af20972abe1437eaf1ab97c1cef [diff] | |
parent | 4056c9ed07af3098430287b3f891671b6557db5e [diff] |
am 4056c9ed: am 1fef6339: am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1 * commit '4056c9ed07af3098430287b3f891671b6557db5e': Suppress GestureDetectorTest