tree ea15f0bbe298f60b2d13ec62dcc9374ec3b233a4
parent 153f23eb42ec855af185f8bd018913dc3110b3b3
parent f0b4733317508ee80d1d0b24a16f309824885c1e
author Winson Chung <winsonc@google.com> 1316759980 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316759980 -0700

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

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