tree 50529f5ebb23edbddf03e94c45bc9fea1c17903f
parent 36f24acf89c2e9aa0d49b5e4b68ffe7d71b75c07
parent 757167c27ebe82f694db853fa6bf55220e03a64e
author Adam Cohen <adamcohen@google.com> 1396666841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396666841 +0000

am 757167c2: am 59551217: Merge "Attempt to fix crash on workspace drag and drop on certain JB devices" into ub-now-mister-ugly

* commit '757167c27ebe82f694db853fa6bf55220e03a64e':
  Attempt to fix crash on workspace drag and drop on certain JB devices