tree 8b6ed6b0b2e11e222caa3fcc4515e87e5c65484e
parent 1308e53d74744e4601264c6799f364971da9e3a4
parent 1fbe9d192e03eeadbddad79f6287f151f0e911ec
author Dan Sandler <dsandler@android.com> 1392411242 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411242 +0000

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

* commit '1fbe9d192e03eeadbddad79f6287f151f0e911ec':
  Enable Launcher2 workspace import.