tree 10da860fcff71886af91d082e31f0e1917926848
parent 785203b22a48ea6c244688bcf66cafaf349c62fd
parent 3734461fa74d27b5e7f3edcd5ae5033841f56679
author Dan Sandler <dsandler@android.com> 1414566368 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566368 +0000

am 3734461f: am 737776b2: am d3701d42: am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.

* commit '3734461fa74d27b5e7f3edcd5ae5033841f56679':