tree de6a4c67e36fab2b613dce2aed1b3dfcd1a06b7f
parent a7d7e653f02d6148ad0ee06a1c78c7593455b2d1
parent 8fc778984cd0b737df102fca14be7c1815505b80
author Ying Wang <wangying@google.com> 1281644051 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281644051 -0700

am 8fc77898: Fix keycode. [Cherry-pick from master]

Merge commit '8fc778984cd0b737df102fca14be7c1815505b80' into gingerbread-plus-aosp

* commit '8fc778984cd0b737df102fca14be7c1815505b80':
  Fix keycode. [Cherry-pick from master]