tree 54cd33e86a0d29344bc1d93b2ec1881ee364f538
parent fc1fc03632ea5001402823aabb821f8d52c9476e
parent 59cbd4188958b644afe677cb5cef39f221c993a2
author Michael Jurka <mikejurka@google.com> 1337300286 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337300286 -0700

am 59cbd418: am 4d173e93: Merge "Fix rendering bug while dragging" into jb-dev

* commit '59cbd4188958b644afe677cb5cef39f221c993a2':
  Fix rendering bug while dragging