| commit | 01f30731fe3ef1d8c05c2833988911258862c985 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@android.com> | Wed Jan 26 19:08:42 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 19:08:42 2011 -0800 |
| tree | 39a464e473413e9fbe0237ef90ba318ebb9391c1 | |
| parent | 3d0d9937c5022aba8e46aac309c2121f94161469 [diff] | |
| parent | 6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc [diff] |
am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps." * commit '6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc': Move keymaps from sdk/emulator/keymaps.