tree e35d1f0c3fde6a154ba0b3120e7e7204e77d01fe
parent 8abb5cc10f295940e6706c72e2e0c93bf0de01e8
parent 85fd5030b11d412f345b0ed039aa9912c7973aea
author Jean-Baptiste Queru <jbq@google.com> 1283347430 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283347430 -0700

am 85fd5030: Revert "Fixed problem with keymap files copied to target"

Merge commit '85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp

* commit '85fd5030b11d412f345b0ed039aa9912c7973aea':
  Revert "Fixed problem with keymap files copied to target"