tree cdcbf6443dbfdcc0930909e160d93b7bdcb3755d
parent 0c280768446f8de0afc4d1b94aeb6dda7a879bce
parent 658e56fccae72413b8cb1a3f3a1a425f4d4dd57f
author Dan Sandler <dsandler@android.com> 1392410288 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410288 +0000

am 658e56fc: am 5b3bdd39: Enable Launcher2 workspace import.

* commit '658e56fccae72413b8cb1a3f3a1a425f4d4dd57f':
  Enable Launcher2 workspace import.