tree 10da860fcff71886af91d082e31f0e1917926848
parent 27e3d35ffed7e35f28209c6926e979dda6b0b96a
parent b5e1753d5dceed10dfc077c6a71e4ab3c9ecc8cc
author Adam Cohen <adamcohen@google.com> 1414566084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566084 +0000

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

* commit 'b5e1753d5dceed10dfc077c6a71e4ab3c9ecc8cc':