tree 8db96f71e691ac047c27eec4e3c859dfde2ee115
parent dab3b5fb0ac537696eaf65347d6376f27b4c8f06
parent 5f08bf3a059964d49ab02e10c1a6e1f0df50524d
author The Android Open Source Project <initial-contribution@android.com> 1320420799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320420799 +0000

am 5f08bf3a: Reconcile with ics-mr1-release

* commit '5f08bf3a059964d49ab02e10c1a6e1f0df50524d':
  Tentative fix for monkey crash, issue 5556086
  Updating default workspace, fixing missing Browser icon. (5358657)
  Fixing regression where scroll position would be offset when rotated.
  Fix regression: QSB is not clickable
  Tagging where ItemInfos are created for debug purposes
  Fix crash when package list is updated
  Tweaking the logging in the fail case, adding additional cases for where the db icon cache should be updated. (5205131)
  Fixing various issues with the dock.
  Fix wallpaper picker crash
  Fix crash on phones