tree e83030f3005d44e7314ea2cba2ce41fab9e98ea8
parent 1c00fd0b045179c9e6cc2dfc344cddc1a8d5b383
parent 6dbe049431741a9dfa05f7eee144335e9da76281
author Adam Cohen <adamcohen@google.com> 1386033458 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386033458 +0000

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