summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-10-21 10:53:49 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-21 10:53:49 -0700
commit4e00a8d5826c5a81d5c9b4a5f6c4ee40e00e5426 (patch)
treedb8831f603b250de4f9f835649055612a9758546 /libs/ui/FramebufferNativeWindow.cpp
parent0d4e658bade07d0a1c5f35cb76affdf0a6d3f95f (diff)
parente894ff7a7693fdc406b4f4b28cfd1d9d7d966b38 (diff)
am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38' * commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38': Return display name in SipConnection.getCnapName().
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions