tree aa8511319a08677679b7967e7bb925f460f085e3
parent 87f445c8b28c59e787e5fbfc7ba223e112d2263f
parent b3084e87fcf7b617899b3c858d5372d079e0fe36
author Dan Sandler <dsandler@android.com> 1386117892 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386117892 -0800

am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf

* commit 'b3084e87fcf7b617899b3c858d5372d079e0fe36':
  Revert "Revert "Enable Launcher2 workspace import.""