tree 0503aea33af3ee189912279399a073e8112e2d73
parent ffba6d63029d367fc37852a871d9a1f15a0cfb91
parent 1f26ea1306a018a0d0eac2295a5ca235b9475d86
author Jeff Brown <jeffbrown@google.com> 1295987902 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295987902 -0800

am 1f26ea13: am 561a434b: Merge "Fix emulator trackball." into honeycomb

* commit '1f26ea1306a018a0d0eac2295a5ca235b9475d86':
  Fix emulator trackball.