summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Jake Hamby <jhamby@google.com> 2011-06-07 16:32:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-06-07 16:32:10 -0700
commit22165bb54af1cd3cb636c1d65da7c643d854c385 (patch)
tree2c920b3c38596abb4b5cec99297413b08fec967e /libs/ui/FramebufferNativeWindow.cpp
parent229d3a0cbce70db82003705abf6844deec136d20 (diff)
parentae62b7b0bca9c46dea30ee81a7aada3e7576638b (diff)
am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b': Fixes for SMS Cell Broadcast support.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions