summaryrefslogtreecommitdiff
path: root/libs/ui/KeyLayoutMap.cpp
diff options
context:
space:
mode:
author Katie McCormick <kmccormick@google.com> 2011-02-10 13:03:27 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-10 13:03:27 -0800
commit8952156b4b45401ce692d53c6ae9bd990956f254 (patch)
tree55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d /libs/ui/KeyLayoutMap.cpp
parent00c662cbdf12e5e80e17463b8aa7c533fa2779eb (diff)
parentb91f20af989649dd04652e95a9cfb9f85f4e7086 (diff)
am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460': cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
Diffstat (limited to 'libs/ui/KeyLayoutMap.cpp')
0 files changed, 0 insertions, 0 deletions