summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-02-24 20:32:13 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-24 20:32:13 -0800
commita602be6f8c2a21459c561ae4ec37dc8c62605bf1 (patch)
treecc2461238e706d03a7db7b8e4b1974f56191ffc2 /libs/ui/FramebufferNativeWindow.cpp
parentccbe0e188bc37f9d65f5b1a51eb33091323b07db (diff)
parent6043f9643771264ff6832b7367f60c50f1658952 (diff)
am b052ecaa: resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
* commit 'b052ecaa7e6ce40cec43efe5353b4bb12079aa55': LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions