tree cba62d0d64153aa2169651696bc238591341d679
parent ba7fe381ed2c348f6caed1f02b421889baf265a6
parent 69c4dedd867e034120973f44dd4342e07e33196c
author Dan Sandler <dsandler@android.com> 1414085501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085501 +0000

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

* commit '69c4dedd867e034120973f44dd4342e07e33196c':