tree cba62d0d64153aa2169651696bc238591341d679
parent 7ed74d2cc2deb59e32d72a0950e7beb179d73d46
parent 737776b2749dc27e919c4324aa28efe3df8ea0ba
author Dan Sandler <dsandler@android.com> 1414085488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085488 +0000

am 737776b2: am d3701d42: am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.

* commit '737776b2749dc27e919c4324aa28efe3df8ea0ba':