summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2011-05-04 12:47:30 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-04 12:47:30 -0700
commit3b791365263dce7035b9aa20f3d18109483498dd (patch)
tree6fa9206a9b1028672f44ec63fb27853b20b083eb /libs/ui/FramebufferNativeWindow.cpp
parent3146d231ccd930df1751a640fc65205f956e64a6 (diff)
parent8fdedfd3d341345e6121d6734c55dd7ee4976cbf (diff)
am 9c7e6fc5: am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit '9c7e6fc50614cc1739d4bfbf6187893c27b01a67': Add auto-restore timeout for secondary networks.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions