summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-01-21 17:57:51 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-21 17:57:51 -0800
commit59b4cfc4b377a06ef1b423b2a2027273c4238fb1 (patch)
treeb0507a63755050546c50e1f613ec664e89062a44 /libs/ui/FramebufferNativeWindow.cpp
parent9dd486267ffe435bcff99a44eb0d315a44f01d96 (diff)
parentaa09eba872f0398cd837e44911697f0d1f732db3 (diff)
am 76c29e63: (-s ours) am f167c4bf: DO NOT MERGE
Merge commit '76c29e633fd924e0f98f34768999abb991753394' * commit '76c29e633fd924e0f98f34768999abb991753394': DO NOT MERGE
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions