summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Mindy Pereira <mindyp@google.com> 2010-10-21 10:47:15 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-21 10:47:15 -0700
commit9a9849ac7f20923af705887099696721c58207e6 (patch)
tree8dbf911ee3e19421167f3ee6cd8f37c5740c4e12 /libs/ui/FramebufferNativeWindow.cpp
parent9c09ebd2b49560a2bc91062bc926615ffed87ca9 (diff)
parent62ad0db62393073a8cda9b21e4ae1506954c10a5 (diff)
am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5' * commit '62ad0db62393073a8cda9b21e4ae1506954c10a5': DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions