tree cba62d0d64153aa2169651696bc238591341d679
parent 972470963907e21096891220b2a5ce784bf1e7e3
parent 5315e31a65cb912a748fe5d4d734a789168895a2
author Adam Cohen <adamcohen@google.com> 1414085337 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085337 +0000

am 5315e31a: am 102cff96: am 47747fd4: am 0b2b235c: am 019f5892: Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose

* commit '5315e31a65cb912a748fe5d4d734a789168895a2':