tree a22f9b9b199f3100dde7486dae7274645e0f56cd
parent 0a63fa82267580d41e28e22befdea752cbac1825
parent 09d121923b0673605f95e6b178a7b8fff27551d8
author Adam Cohen <adamcohen@google.com> 1392411735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411735 +0000

am 09d12192: 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 '09d121923b0673605f95e6b178a7b8fff27551d8':
  Only import workspaces for non-tablets (where grid hasn't changed)