tree 9bab576da48aede0552910294fd67f38575ca7e5
parent db6f304d6bc6a93a30b7b6f7ae4339f719c84797
parent 474a35735ae758757dfd161a5c045d027bb9e033
author Adam Cohen <adamcohen@google.com> 1393874376 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393874376 -0800

am 474a3573: Merge "Avoid stripping empty screens if the workspace is still loading (issue 12523285)" into ub-now-lunchbox

* commit '474a35735ae758757dfd161a5c045d027bb9e033':
  Avoid stripping empty screens if the workspace is still loading (issue 12523285)