tree a0d55fb1fec951ccbf5d4672c1ce78d06cdb1c3c
parent 16fa074d824ed64c02e8ac3bca6cc7eaab6db509
parent c924cacfab4144eefdf8e46dfc82d79cb15e9c96
author Adam Cohen <adamcohen@google.com> 1386083253 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386083253 -0800

am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf

* commit 'c924cacfab4144eefdf8e46dfc82d79cb15e9c96':
  Only import workspaces for non-tablets (where grid hasn't changed)