summaryrefslogtreecommitdiffstats
path: root/libs/ui/InputReader.cpp
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2010-10-10 12:53:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-10 12:53:26 -0700
commit02611a728036b283c1d46612a124498eebe8a840 (patch)
tree829a1bd7fb156dad5e089d56f50affe7048bbfe3 /libs/ui/InputReader.cpp
parentceb13338e6d0b5b6b7b67cc1f477144f2dacacff (diff)
parent4f2c8cc86ad1b4c65806d7547407c60ea36b8abe (diff)
downloadframeworks_base-02611a728036b283c1d46612a124498eebe8a840.zip
frameworks_base-02611a728036b283c1d46612a124498eebe8a840.tar.gz
frameworks_base-02611a728036b283c1d46612a124498eebe8a840.tar.bz2
am 4f2c8cc8: (-s ours) am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe' * commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe': DO NOT MERGE Only show edge glow effect on 1 side at a time.
Diffstat (limited to 'libs/ui/InputReader.cpp')
0 files changed, 0 insertions, 0 deletions