tree 35aad1292d0f5afbd5850726804622ce24ff324a
parent b848ba188dee80ad460a65f7fa28b858972a87c9
parent 004f9d772ce44a95111e38e9a447074b090b37f9
author The Android Open Source Project <initial-contribution@android.com> 1277847754 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277847754 -0700

am 004f9d77: set up fast-forward from froyo-release to gingerbread

Merge commit '004f9d772ce44a95111e38e9a447074b090b37f9'

* commit '004f9d772ce44a95111e38e9a447074b090b37f9':
  Filter input events and smooth out touch scrolling. Bug 2639807
  Fix proguard flags.
  Sort apps in AllApps3D.setApps().
  Launcher2 performance: Don't sort apps in LauncherModel.
  resolve conflicts
  Bug 2509023 - NPE on upgrade to froyo
  Unbind root script around load activities to prevent commands from being delayed due to swap buffers.
  Fix 2507267 - stack overflow when adding shortcut