summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-01-19 16:34:11 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-19 16:34:11 -0800
commit9b352fe319ceafc72e73b5de139e5eeedf6a8944 (patch)
treef4547aa06838a91fc394f17e6ff967f5414d2362 /libs/ui/FramebufferNativeWindow.cpp
parentfbf4202c899e55ba8b1d0002e728f591f0b1f64f (diff)
parent4c02bb627468a46d30363d2c147c776c18de7ad1 (diff)
am 181963a0: (-s ours) am 196926b9: Merge "DO NOT MERGE" into eclair
Merge commit '181963a0200e7c442d66f9f893da41e2b52a4d8c' * commit '181963a0200e7c442d66f9f893da41e2b52a4d8c': DO NOT MERGE
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions