summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-10-19 23:03:25 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-19 23:03:25 -0700
commite894ff7a7693fdc406b4f4b28cfd1d9d7d966b38 (patch)
tree8b040650be7af522fbdf8d812f67af98505ed985 /libs/ui/FramebufferNativeWindow.cpp
parentadd9db83fdbf939f0610f8b357788fd3e8ad9ab5 (diff)
parentb595e094e3901ff8a224eaf7d4869e7d2e5649dd (diff)
am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp * commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd': Return display name in SipConnection.getCnapName().
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions