summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Bart Sears <bsears@google.com> 2012-01-04 21:52:04 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-04 21:52:04 -0800
commit77f0a7535d2f785c70a2e682a1db665576fb9d7e (patch)
tree197a1bd990333021bf7e1dcf4f030b521b902fce /libs/ui/FramebufferNativeWindow.cpp
parente9e2f6f78a08060640b1bc38812d30f12bdd589c (diff)
parent53cc3c7676fd026e743de1e884632bb9b49b702a (diff)
am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '875b69928193e464243cf491bfe861f30644e9b4': Do not allow file:// access when it is disabled. Do not merge.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions