summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-02-22 21:40:51 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-22 21:40:51 -0800
commit37bf89b5e9d0151f7584325504232cf997b07abf (patch)
tree3d6def11580b215b362c5b167736580b056a589c /libs/ui/FramebufferNativeWindow.cpp
parent0c71423061db855973e27cab76363334605a416d (diff)
parent5c3de225bcc35ee0fd794982964523a1a9bf091d (diff)
am 4c9647cf: (-s ours) am beb01c93: Merge "DO NOT MERGE." into honeycomb
* commit '4c9647cf4c01d4b8e0fce693a1b85743d7df8695': DO NOT MERGE.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions