summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Simon Wilson <simonwilson@google.com> 2011-04-05 10:26:54 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-05 10:26:54 -0700
commite6b56e35dea220014bd123f8f9f388163176289e (patch)
tree9e6efa730f6809bd12f2bed0f686de6757ba5ffa /libs/ui/FramebufferNativeWindow.cpp
parent56f6526949fd4222ab120119a2270e13d2072077 (diff)
parent8757f75762e684f2b8aedf93520e4bc457ee429e (diff)
am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a': DO NOT MERGE Disable WiMAX when "Data Enabled" is off
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions