summaryrefslogtreecommitdiff
path: root/include/androidfw/KeycodeLabels.h
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2012-10-24 10:59:40 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-10-24 10:59:40 -0700
commita4dcf311c1955108e0b81e9dcd48723acde1acca (patch)
tree205a2c2f89bf33901f8a737902f03757498e4f55 /include/androidfw/KeycodeLabels.h
parent40ca868a08e2c764a206a5e32b7e9af46fd168da (diff)
parent56e75631bd737e5362309330d4839cc1dddb501c (diff)
am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
* commit '56e75631bd737e5362309330d4839cc1dddb501c': Fix issue #7342364: JellyBean broke Toddler Lock, again
Diffstat (limited to 'include/androidfw/KeycodeLabels.h')
0 files changed, 0 insertions, 0 deletions