summaryrefslogtreecommitdiff
path: root/libs/ui/InputReader.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-10-13 15:50:27 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-13 15:50:27 -0700
commit48ffcfce90e4ce6e2f7e79d7a7ab6b71a765110c (patch)
tree1ad98182fc998d6cd5cac18ea8be029f1d5de2fe /libs/ui/InputReader.cpp
parent779d49ea2e3be2171625142d2868bc8f13e6bd86 (diff)
parentbd44d854263d1728c8d96fcc8b43fcfe2d6cba80 (diff)
am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Diffstat (limited to 'libs/ui/InputReader.cpp')
0 files changed, 0 insertions, 0 deletions