summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-03-01 16:13:21 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-03-01 16:13:21 -0800
commit84a75e90b645323b3578c976fd361077b4777e94 (patch)
tree020803d23d451d1e01e7516ee2e3201a307039a2 /libs/ui/FramebufferNativeWindow.cpp
parentf9ae233be1532f83c59bcb99508ebe75e1b78f00 (diff)
parent416f1d9b9a260b3fca95d2a241abe823d50157b3 (diff)
am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp * commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565': DO NOT MERGE
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions