summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-03-14 12:04:51 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-14 12:04:51 -0700
commit50093af2a2cf59ee07380bc3fe5225d11357c184 (patch)
tree6d362a266557b90295fa9667d58c8e4325085dd7 /libs/ui/FramebufferNativeWindow.cpp
parent7cdf08b29ff30d42b9b41cff92b41cbc43663da3 (diff)
parent096b928fb8be7a2ea76d577466a86dbbd5061d09 (diff)
am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0': Implement new NFC-EE API's as shared library (frameworks/base).
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions