tree cba62d0d64153aa2169651696bc238591341d679
parent cae21c250be3b5a7c04b9360c9955cd628374ede
parent 09d121923b0673605f95e6b178a7b8fff27551d8
author Adam Cohen <adamcohen@google.com> 1414085517 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085517 +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':