tree 0a752a906258a30b151e3c7eb107b1e2511fc35e
parent dda473ed5ac27c4090e1685a2f435bbbbda23463
parent 966182f222da8da1fed2ce1f3945fae3d3d488d0
author Andrew Flynn <flynn@google.com> 1336596031 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336596031 -0700

am 966182f2: Merge "Fix drag layer" into jb-dev

* commit '966182f222da8da1fed2ce1f3945fae3d3d488d0':
  Fix drag layer