summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2011-05-24 12:56:32 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-24 12:56:32 -0700
commit6b8172589053345941e7073330c7302888ff9b84 (patch)
treefa7e08be79acf374c2b1528c101429d31ff3206f /libs/ui/FramebufferNativeWindow.cpp
parent627147ac990fbf1e96074190b3b95c5cd4ddf3e3 (diff)
parent57162780ea9c5b9565c2ae78b088e0c020c7489f (diff)
am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
* commit 'f656d95078fbcb65df7753ba8c04679c5389e15c': DO NOT MERGE Use previous version if version is a codename
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions