tree ee58d051a9bf05de1c7fe2c8b77f70569d411b5c
parent 98f737bc54f8610a4225f5b364b1827dfb52789f
parent 9a03678e12909c663ee856976d50fd38c8ab6945
author Adam Cohen <adamcohen@google.com> 1321938736 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938736 -0800

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

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