summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2011-12-06 16:22:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-06 16:22:07 -0800
commit7419051ce082d1bcd1f8d4e0a4c1d76cf98a86d2 (patch)
tree0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /libs/ui/FramebufferNativeWindow.cpp
parent852ef84d0a698d411989d87542454e2cd5d1c1a6 (diff)
parent0c62c3799ea0066bfdbe14e3833beac8099ee30b (diff)
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a': DO NOT MERGE: Remove the AVI extractor.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions