summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2010-06-10 11:50:51 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-10 11:50:51 -0700
commit168a7eca42dba1a1a5e1a3f793eb3194da321327 (patch)
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 /libs/ui/FramebufferNativeWindow.cpp
parentaed039d604f822987a2680c204e5a2ff0855f8d7 (diff)
parent5ca447aa0c63a20bf1e121f0a54bbd1a46ccf27d (diff)
am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp * commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c': do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions