summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-07-13 22:38:44 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-07-13 22:38:44 -0700
commit1bce9e25b6979780d849096059ef73507bdda250 (patch)
treef8c7848d12dac6e23fb714b8b7f3e0aee8a802f1 /libs/ui/FramebufferNativeWindow.cpp
parentab3ec17608fd17b48ae3a4b7359f5a150da3cf7e (diff)
parent01588acaf87cfe9916239b7b26cc6810e0097138 (diff)
am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '01588acaf87cfe9916239b7b26cc6810e0097138': Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions