tree ddfde3200255269b19ca263e5af5018c4a11b954
parent 3e56fbf0017143811c74b8db64f0ce0453244532
parent 0b5e98f7c2acf69d2d624620059a3e14fdb27d87
author Daniel Sandler <dsandler@android.com> 1382563121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382563121 -0700

am 0b5e98f7: am 55585dbc: Fix loading widgets in <include>d workspaces.

* commit '0b5e98f7c2acf69d2d624620059a3e14fdb27d87':
  Fix loading widgets in <include>d workspaces.