tree c1401da5426cd0c3cc21c8efd34e9956d597f1ab
parent 011c30c159a1d5af019d8d4625f3273d6b2eec99
parent d9f3dac3492245a8c4aff111c7ce9e3800d7c316
author Patrick Dubroy <dubroy@google.com> 1295416878 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295416878 -0800

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

* commit 'd9f3dac3492245a8c4aff111c7ce9e3800d7c316':
  Prevent NPE when shrinking workspace