summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2010-08-18 14:22:08 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-18 14:22:08 -0700
commitbb1562e559f63783ba5bc426567e4a19c3731ac5 (patch)
treea33e9c66b0b726047894e3cd7737f9385f8b6555 /libs/ui/FramebufferNativeWindow.cpp
parent24844c9a30cf20467cd19d28f2e74de74c9c3622 (diff)
parent03805f729cacead5d0797c840430ea99b26036d6 (diff)
am 03805f72: am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit '03805f729cacead5d0797c840430ea99b26036d6' * commit '03805f729cacead5d0797c840430ea99b26036d6': tracking merge of external/apache-http from dalvik-dev
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions