tree fb1f8f535b72f5b76184848ca4e4e610f01d720b
parent 4cb7d294e1a5b97a734e2bbf30303eb0b5cd27fb
parent 314aaeca0ca84583fd637ff398a08d7c31d9b0a5
author Dan Sandler <dsandler@android.com> 1392410292 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410292 +0000

am 314aaeca: am a6a296ba: Revert "Enable Launcher2 workspace import."

* commit '314aaeca0ca84583fd637ff398a08d7c31d9b0a5':
  Revert "Enable Launcher2 workspace import."