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
commit4fa5dc52c04680db3b15b8fe741a2ee699ad933f (patch)
treed3ab7b42eae95f1b0ea7b186adf4a1def484babf /libs/ui/FramebufferNativeWindow.cpp
parent99a444e7312aa099adcd819fb6a269b9aa925d2f (diff)
parent407c94a147ac52dbd3747160748a219553bcbf2b (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