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