summaryrefslogtreecommitdiff
path: root/libs/ui/KeyLayoutMap.cpp
diff options
context:
space:
mode:
author John Wang <johnwang@google.com> 2011-06-16 17:14:28 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-06-16 17:14:28 -0700
commitcfa204826c5a0145b865cfbe5e0d6b8fdaa498b8 (patch)
tree51284820a388ffca949bf1773e9ee8229d52395e /libs/ui/KeyLayoutMap.cpp
parent7ded3a1a7322ddb750cc690ce93b46b35d872039 (diff)
parent0fcbbddfcfe44e4ed132f7fd41186f4789de3aa0 (diff)
am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90': Revert "Do not merge. Return null id for Non-phone device."
Diffstat (limited to 'libs/ui/KeyLayoutMap.cpp')
0 files changed, 0 insertions, 0 deletions