tree 018e92d22bf43b1a2c115b2705975cc845c7487b
parent 3db07a0fe40745ec3d5ffe1348e2390b042b335d
parent ca1d18ef1c7d96627df88e17d3225f15326b1a4e
author Patrick Dubroy <dubroy@google.com> 1295404763 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295404763 -0800

am ca1d18ef: Merge "Prevent NPE when shrinking workspace" into honeycomb

* commit 'ca1d18ef1c7d96627df88e17d3225f15326b1a4e':
  Prevent NPE when shrinking workspace