tree 1664382aa17eb82db6f397d535fff7bd57ac2055
parent 0162133795f67ce649640e3b9d86dcce1c80864b
parent a665ca805c7ecda89ef95658f4d1c09ba6bd7f2e
author Jeff Brown <jeffbrown@google.com> 1284337278 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284337278 -0700

am 69206512: Fix some API discrepancies in InputEvent.

Merge commit '692065128e66de77470de2c50ead2bef0452952a' into gingerbread-plus-aosp

* commit '692065128e66de77470de2c50ead2bef0452952a':
  Fix some API discrepancies in InputEvent.