tree ef705554cd2c07af741106814dfe047aab895ce0
parent a288e1af0a106ce257e7ad64a7736fb13d946485
parent fdf5fd63c6e76fffd28df6d032ee6bac1417edf6
author Joe Onorato <joeo@android.com> 1283282361 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283282361 -0700

am fdf5fd63: (-s ours) DO NOT MERGE - Allow the workspace to swipe while it\'s loading.

Merge commit 'fdf5fd63c6e76fffd28df6d032ee6bac1417edf6'

* commit 'fdf5fd63c6e76fffd28df6d032ee6bac1417edf6':
  DO NOT MERGE - Allow the workspace to swipe while it's loading.