summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Wei Huang <weih@google.com> 2010-06-28 15:08:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-28 15:08:37 -0700
commit5b422186f3740a228620210db6d0be0a9838be51 (patch)
treefcb20f832fb5f36b2dd5952c9993dc4bfcc6d4f3 /libs/ui/FramebufferNativeWindow.cpp
parentbe5f31212064b78735cd6f643015f244ad81ce78 (diff)
parent9c4c98b1027bbf0b7652a56a1f5614a028a01d33 (diff)
am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp * commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33': new presence icons for video/audio chats.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions