tree affcee4e5d8431930e46a99410fd09e68e220bf2
parent 4168dc497ded7c697d972283db7c8579788c23d5
parent 91d30b76779a7911e4252a68c0b70a154b3295c5
author Dan Sandler <dsandler@android.com> 1392410282 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410282 +0000

am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.

* commit '91d30b76779a7911e4252a68c0b70a154b3295c5':
  Disable importing workspaces from Launcher2.