tree 2052153e9fa745b8a1fc4319216ed54cf698d90c
parent 512093f3655a1970f1f05605deb219ef9d6ab957
parent 87f445c8b28c59e787e5fbfc7ba223e112d2263f
author Adam Cohen <adamcohen@google.com> 1392410304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410304 +0000

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

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