tree 7c8a60da10b140adeb9ac210a45422a8243d6541
parent e07e4c0a7b144aa7b1f30b12c3a8b128716decd2
parent 68e491d5da771c934553680b7ba078babd3e2b61
author Jeff Brown <jeffbrown@google.com> 1280526583 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280526583 -0700

am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread

Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp

* commit '00e5c61366d3d3d62c259277823ea15a14f68ad4':
  Improve thread safety of input mappers.