tree 12ed20112cef3916f36775b0f700e533678f359f
parent dab85aa7274a1aa37a3384f70780fdaa034b7ae5
parent 07f920ed7f98e10a9c27f9f2cebc2fe0ab91dbd5
author Adam Cohen <adamcohen@google.com> 1321917266 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321917266 -0800

am 07f920ed: Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1

* commit '07f920ed7f98e10a9c27f9f2cebc2fe0ab91dbd5':
  Fix issue 5639994: disabled multi-touch on folders