tree b8806e8266812119087f0bcf6528d50d7664f631
parent 3f50b467e3aa9d9fdf5be540c3c620a1a3a41cfc
parent 96b8a056f81720e632d07e3467f1528e834f746e
author Michael Jurka <mikejurka@google.com> 1336358249 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336358249 -0700

am 96b8a056: Merge "Fixing NPE in DragController. (Bug 6449615)" into jb-dev

* commit '96b8a056f81720e632d07e3467f1528e834f746e':
  Fixing NPE in DragController. (Bug 6449615)