am 6ac23abf: am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1

* commit '6ac23abf0e3978e6995981810ddc01812a235387':
  Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector