tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 2265036a94bfa64ba84de58c32a97214115a9e0e
parent a7f6936edc4baef281add618ed98de49ccc2fac0
author Adam Cohen <adamcohen@google.com> 1392410114 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410114 +0000

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

* commit 'a7f6936edc4baef281add618ed98de49ccc2fac0':