commit 54e0d4631da5d2d31076a67a28257265f8bf0a16
author The Android Open Source Project <initial-contribution@android.com> Wed May 16 08:45:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 16 08:45:43 2012 -0700
tree bec7b8cc00bcb1f54b98aab96b7ac39ad0e962d6
parent 72ee57ad99bbd3bbf9a22f01d821981faf7153e1
parent 9a1a9e4065da8c8f05127701da39d9448b0d6694

am 9a1a9e40: Reconcile with jb-release nakasi-factoryrom-release

* commit '9a1a9e4065da8c8f05127701da39d9448b0d6694':
  Fix folder order regression (issue 6482634)
  Fix folder order regression (issue 6482634)
  Fix launcher crash when adding widget (issue 6433360)
  sw600dp pixel perfect tweaks
  Set app_icon_size back to 72dp for sw720dp
  Fixing NPE. (Bug 6460298)
  Try and resolve the package name from the intent directly falling back to the resolved component name if it fails. (Bug 6452306)
  Workaround for default workspace widgets not getting notified for new widget sizes. (Bug 6439962)
  Fix issue where certain widgets don't appear in tray (issue 6339060)
  Preventing widgets that don't fit from showing in tray. (Bug 6331357)
  Fixing launcher ANR (issue 6238175)
  Fix issue where hotseat wasn't being correctly persisted (issue 6259158)