tree 9bab576da48aede0552910294fd67f38575ca7e5
parent 5c40ee50ffecda5ede7fd7e1166459d59e73b30a
parent 6902916b07e5d2bb879746888deb2a567976b87a
author Adam Cohen <adamcohen@google.com> 1393874626 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393874626 +0000

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

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