tree cba62d0d64153aa2169651696bc238591341d679
parent 35f3d1f74cdacb29f8732c45e8bcc686f024433e
parent e0516f539ee175420b1bbf2c71d5a2603625a6e7
author Adam Cohen <adamcohen@google.com> 1414085498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085498 +0000

am e0516f53: am c1fedf54: am 616af06a: am cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf

* commit 'e0516f539ee175420b1bbf2c71d5a2603625a6e7':