summaryrefslogtreecommitdiff
path: root/libs/gui/SharedBufferStack.cpp
diff options
context:
space:
mode:
author Gilles Debunne <debunne@google.com> 2011-03-14 13:41:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-14 13:41:14 -0700
commitb66cc3d5fc928f77190e84f2baa3dee12edbfb10 (patch)
treeaab456746a87080f3777cd2506e94fae18f43931 /libs/gui/SharedBufferStack.cpp
parent00ff0ca9228ef276adf7fe6f14e24dac07e1d4ba (diff)
parent4feb59c624357bf79e5d02c1cbbe4feaeffe16a1 (diff)
am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
* commit '816dd3d443108b473965f97123eef7300f53615f': Double tap on a word no longer opens context menu. DO NOT MERGE
Diffstat (limited to 'libs/gui/SharedBufferStack.cpp')
0 files changed, 0 insertions, 0 deletions