tree 10da860fcff71886af91d082e31f0e1917926848
parent 014cb5b06bcd171fdad1420b352c8f2374f678e0
parent 5d2e2c5dc19c7d5d0f2738da9de08d4c36c3cc9e
author Adam Cohen <adamcohen@google.com> 1414566259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566259 +0000

am 5d2e2c5d: 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 '5d2e2c5dc19c7d5d0f2738da9de08d4c36c3cc9e':