summaryrefslogtreecommitdiff
path: root/libs/ui/KeyLayoutMap.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-12-07 17:14:48 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-07 17:14:48 -0800
commitb69e488d5d88848e34ddfdc775ae6b506737f5ab (patch)
treebb3e26939a6b6a0c0b0b5ab4b12fe4f0dc5d7bf3 /libs/ui/KeyLayoutMap.cpp
parenta6d2bbc22f7b6cfdbbe80c3449978b5da4eeba55 (diff)
parent74bb0375a7dfa42a2847936b9f2467f80d2bcab2 (diff)
am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1
* commit '2657d889ea7e60f5d97926dc7720e9780b6796e0': DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...
Diffstat (limited to 'libs/ui/KeyLayoutMap.cpp')
0 files changed, 0 insertions, 0 deletions