summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-01-28 10:47:15 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-28 10:47:15 -0800
commitdea3af75f5cda068ad80e6168c53088cb0791865 (patch)
treeb9b8be6cf5b834c61cf78f81e0ced17370f06a8a /libs/ui/FramebufferNativeWindow.cpp
parent2734f183ddb29a14310b00dafba450780000cdde (diff)
parent9b65699d1142cb2e4358d483353b61b315d26fea (diff)
am 4f01c927: (-s ours) am 5ff24d5d: DO NOT MERGE
Merge commit '4f01c927503401d560cb4f209b7d9a723c32e8cb' * commit '4f01c927503401d560cb4f209b7d9a723c32e8cb': DO NOT MERGE
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions