tree 9a2a71b22e0283d4a19e8cb2b324c3ec141e51df
parent b3787d57fffbb898f4767f7a94031cafe974a0b0
parent e740dd0c8fde910066f9ddf83b4ab094ed95eaf9
author Jeff Brown <jeffbrown@google.com> 1284337469 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284337469 -0700

am e740dd0c: am 69206512: Fix some API discrepancies in InputEvent.

Merge commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9'

* commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9':
  Fix some API discrepancies in InputEvent.