tree 3dbe0c688f262114533f14dae50db794b43659b7
parent 5e64700bf7f53127d6dcf2e6207630c6fd161f8a
parent 100cc263b465242c01dc9eb280d77ffaadbddd39
author Cary Clark <cary@android.com> 1285095291 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285095291 -0700

am 100cc263: (-s ours) am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread

Merge commit '100cc263b465242c01dc9eb280d77ffaadbddd39'

* commit '100cc263b465242c01dc9eb280d77ffaadbddd39':
  Do not merge : cancel text select mode when pressing back, etc.