summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Gloria Wang <gwang@google.com> 2011-03-22 11:42:23 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-22 11:42:23 -0700
commit7b1d26107422569f9555900df78eb4a21be7eb55 (patch)
treee5b894e47bdae3c99ce121f79bdc5c9f0c3c6b0d /libs/ui/FramebufferNativeWindow.cpp
parent77c9e544e2faf7f41501cdad2e9563db5068f0b8 (diff)
parent01facd0ad0a981fab02e246acb028ce6f2cb9144 (diff)
am 97cd837e: (-s ours) am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '97cd837ec1e0eb87fb2a8a80a9789868fb5fecc7': do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions