summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-11-21 21:08:29 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-21 21:08:29 -0800
commit3d81bae2af72d382b7994f46352122b98d5b5ed9 (patch)
treef0c3f94fe57e8a8f0887f2b81c1cfe33c69724b7 /libs/ui/FramebufferNativeWindow.cpp
parent1e8f74ebc06cbe6ddb51be009b07a9fa52f6bc3e (diff)
parentf3e284a1e03dad8fac8afe97d4634627d80b5d7b (diff)
am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad': Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions