tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent 4f2443a5a31cbe09fe8f5e89fa1d08d185d9ae50
parent 47747fd44f3b5e4f37d01055d949eec721490d97
author Adam Cohen <adamcohen@google.com> 1392410205 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410205 +0000

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 '47747fd44f3b5e4f37d01055d949eec721490d97':