tree d7c5fda3a952470b0b697882198a3b8187f942ef
parent b4d3f03ef71e8f9ed6e6f3dd5ff9173420b5055c
parent 6263955b358dd94db7a2c0d0a0e3de21aa805e06
author Adam Cohen <adamcohen@google.com> 1320887477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320887477 +0000

am 6263955b: am 28902a75: Merge "Updating workspace outlines for large UI" into ics-mr1

* commit '6263955b358dd94db7a2c0d0a0e3de21aa805e06':
  Updating workspace outlines for large UI