tree cba62d0d64153aa2169651696bc238591341d679
parent e3a2328f46d3c718ca8a436107c0bd572347ef21
parent 324a4424be7cc351dbc0c2c8dcd13cdc43b4de55
author Winson Chung <winsonc@google.com> 1414085260 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085260 +0000

am 324a4424: 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 '324a4424be7cc351dbc0c2c8dcd13cdc43b4de55':