tree cba62d0d64153aa2169651696bc238591341d679
parent 6565d9ec042ba9b13c1dd541aac619618cd23a5b
parent 82766b62ca6b437507c4ab431fde2a52dff81d29
author Adam Cohen <adamcohen@google.com> 1414085399 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085399 +0000

am 82766b62: am c178c865: am 36402251: am 1c6dee72: Merge "Fix issue where empty page doesn\'t get deleted when flinging to delete a widget in spring loaded" into jb-ub-now-jetsonic

* commit '82766b62ca6b437507c4ab431fde2a52dff81d29':