tree d7c5fda3a952470b0b697882198a3b8187f942ef
parent cbcabbc3c4ffee49f43b8b5a6445c1f409242174
parent ead1d908c139b3cf096434946bbcbbbdd811dc87
author Adam Cohen <adamcohen@google.com> 1320887684 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320887684 +0000

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

* commit 'ead1d908c139b3cf096434946bbcbbbdd811dc87':
  Updating workspace outlines for large UI