OSDN Git Service

am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulato...
authorJeff Brown <jeffbrown@android.com>
Thu, 27 Jan 2011 03:08:42 +0000 (19:08 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 03:08:42 +0000 (19:08 -0800)
commit2f4df9187f1adeb5f8865e6f755c90815836f09c
tree33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f
parent535de8f2a5f1156bd431a13d8af3c10234944b8e
parentc8e7dbb32ee34eb1987eea40a6e48006fabe5402
am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."

* commit '6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc':
  Move keymaps from sdk/emulator/keymaps.