tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 46ee143121e70721a082f656eb75ff0d819f0084
parent 9a2daeb1c23d21716e90563e6f3f4e254866a579
author Winson Chung <winsonc@google.com> 1392411050 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411050 +0000

am 9a2daeb1: 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 '9a2daeb1c23d21716e90563e6f3f4e254866a579':