tree ea15f0bbe298f60b2d13ec62dcc9374ec3b233a4
parent 4193cf571b9838eabf53721733a58eca8236096c
parent 1ad284b7c99ead3ea08fe61f7297fcbd210647c1
author Winson Chung <winsonc@google.com> 1316760292 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316760292 -0700

am 1ad284b7: am f0b47333: Merge "Updating default workspace, fixing missing Browser icon. (5358657)" into ics-factoryrom

* commit '1ad284b7c99ead3ea08fe61f7297fcbd210647c1':
  Updating default workspace, fixing missing Browser icon. (5358657)