am 4056c9ed: am 1fef6339: am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1

* commit '4056c9ed07af3098430287b3f891671b6557db5e':
  Suppress GestureDetectorTest