tree a22f9b9b199f3100dde7486dae7274645e0f56cd
parent dbd4b06db4ae5704069839183b89078e03ece2af
parent 7cb06bde4981411d8e34e6d37a798d0ea85f138b
author Adam Cohen <adamcohen@google.com> 1392411258 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411258 +0000

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

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