summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2011-03-03 11:46:48 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-03 11:46:48 -0800
commitd8cd74f6842c4b28dc625fa45fd7cdb083e5a5f8 (patch)
treea14464123bebfff64910d7c44b1759a699a6caa8 /libs/ui/FramebufferNativeWindow.cpp
parent09758169898a29ec1d5f08784000caf898e0c4a1 (diff)
parenta4c4fbe3b04b14fe03aee40695c6a2e2e8d44f35 (diff)
am 86f1c4d3: (-s ours) am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
* commit '86f1c4d3ba53ea11484628081e8e49ca86e897b9': DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions