summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2011-11-11 11:51:11 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-11 11:51:11 -0800
commit2a484e15af2dd98e007f13701556ab6c06b51a6e (patch)
tree5a287de054a9e7306f3e4a6ef11c937a528cb70d /libs/ui/FramebufferNativeWindow.cpp
parent21b916fae7b9df56531832e4b155f49d93c96e7f (diff)
parent2d4a178249563732a249d23c46ab1dc0b0fd4f92 (diff)
am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae': DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions