tree f412364c413e39abb276027c8f22c8c7d7ffc4c9
parent 04a0d1beaf1eab015cf47afbde3edeb2f1a3bdad
parent cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289
author Brian Muramatsu <btmura@google.com> 1303121303 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303121303 -0700

am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1

* commit 'cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289':
  Suppress GestureDetectorTest