tree 9eb2649d4788ef2ef41538a67c25079b33258c42
parent aea75231a5af14b6ab0ca57b910d1a2e349f068c
parent 3b724c836b13b320b2b2c492c28660617e0d503e
author Jeff Brown <jeffbrown@google.com> 1280526732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280526732 -0700

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

Merge commit '3b724c836b13b320b2b2c492c28660617e0d503e'

* commit '3b724c836b13b320b2b2c492c28660617e0d503e':
  Improve thread safety of input mappers.