summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-29 14:42:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-29 14:42:34 -0700
commit6404116682ff30f9e2170c68a1b56dfa7c6836cc (patch)
tree35aad1292d0f5afbd5850726804622ce24ff324a /AndroidManifest.xml
parentb848ba188dee80ad460a65f7fa28b858972a87c9 (diff)
parent004f9d772ce44a95111e38e9a447074b090b37f9 (diff)
downloadandroid_packages_apps_Trebuchet-6404116682ff30f9e2170c68a1b56dfa7c6836cc.tar.gz
android_packages_apps_Trebuchet-6404116682ff30f9e2170c68a1b56dfa7c6836cc.tar.bz2
android_packages_apps_Trebuchet-6404116682ff30f9e2170c68a1b56dfa7c6836cc.zip
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
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions