tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 933705a64d0486dc9e6988c7b206e605b8283286
parent 11df2825b3894bca19bb36f89db43ed68b2ccc25
author Winson Chung <winsonc@google.com> 1392410168 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410168 +0000

am 11df2825: am 3d14fe94: am 8cffccc1: Merge "Fixing issue with numerous empty screens showing when adding a shortcut to a clear workspace. (Bug 10785413)" into jb-ub-now-indigo-rose

* commit '11df2825b3894bca19bb36f89db43ed68b2ccc25':