tree 579f4e6e8cd611c0f95302e0e53b6739b2e4d84e
parent b380c4d7edc158788a85c906900232675c0164ac
parent 6bb72458f934f00fdfee75323a7919a9f10eba03
author Jeff Brown <jeffbrown@google.com> 1283979790 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283979790 -0700

am 6bb72458: (-s ours) am de2f3340: Update current.xml for touch filtering feature.

Merge commit '6bb72458f934f00fdfee75323a7919a9f10eba03'

* commit '6bb72458f934f00fdfee75323a7919a9f10eba03':
  Update current.xml for touch filtering feature.