summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author David 'Digit' Turner <digit@google.com> 2011-07-11 16:15:27 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-07-11 16:15:27 -0700
commitf22259c53335ad36c526d2152f823099fd3a5015 (patch)
tree62a3555429c3caf6d6220df764adf91a9ee9b991 /libs/ui/FramebufferNativeWindow.cpp
parent748e3ae3591e845b63edad987e4a608ccc7b1dda (diff)
parent3b7791c73e941b39764dab810136a6b882401c62 (diff)
am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5': NativeDaemonConnector: Fix SDCard mounting bug in the emulator. Fix missing NL
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions