tree 9161336fee64efd83249ed298e08f0987593f8f2
parent e5579d82fb29ea4f096f3df989fe7db96fb32b33
parent 33ca87b792259929b371b39c7a6b8dd758fa67d6
author Chris Banes <chrisbanes@google.com> 1441133482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441133482 +0000

am 33ca87b7: Merge "Fix NPE in onTouchEvent again" into mnc-dev

* commit '33ca87b792259929b371b39c7a6b8dd758fa67d6':
  Fix NPE in onTouchEvent again