tree 0ef6de99754dcad2d33a3126228ac850c5c7f9dd
parent 43baad1e22b31b1efa0ec27e16fc84d2acf54467
parent 87023e79a0371523fb7ccc69931bc1f71edb9daf
author Adam Cohen <adamcohen@google.com> 1380230288 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380230288 -0700

am 87023e79: am 4042c3a3: Merge "Fixing some touch / interaction problems" into jb-ub-now-indigo-rose

* commit '87023e79a0371523fb7ccc69931bc1f71edb9daf':
  Fixing some touch / interaction problems