tree 37b7312d34f81a518246f3a71e03a1e6b89a22f9
parent ea8faffe04054dae9f39ca17342813e389907735
parent d7a5f0b7e2b3797c381eb21acc3425191b786264
author Dianne Hackborn <hackbod@google.com> 1277329236 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277329236 -0700

am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.

Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp

* commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440':
  Remove InputConsumer, replacing with InputQueue.