tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 3889209563c118bb2f6e663b5fed5c25a0f84dce
parent 102cff9617f0d14a63c9ad7ed0412fe7ffb6dcc0
author Adam Cohen <adamcohen@google.com> 1392411116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411116 +0000

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 '102cff9617f0d14a63c9ad7ed0412fe7ffb6dcc0':