tree aa4f046fe694926057034328c49d1920b645ea87
parent 8e15ab76d411cb6f20b8e37dd9130e4ab6d6d94c
parent fce34b2ff20961642657f9b6914620dd45007d18
author Dan Sandler <dsandler@android.com> 1392411245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411245 +0000

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

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