tree ee58d051a9bf05de1c7fe2c8b77f70569d411b5c
parent 21291a712821dc8d173e56d4358e68e7ce4938ea
parent cfcc1f9da71fe0503e6911d1bf910ea464886926
author Adam Cohen <adamcohen@google.com> 1321938466 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938466 -0800

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

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