diff options
| author | 2009-03-18 11:33:14 -0700 | |
|---|---|---|
| committer | 2009-03-18 11:33:14 -0700 | |
| commit | 2a73de7b21a89aa2ba4c254d28658b49793425b2 (patch) | |
| tree | ded5bcd581464b4174d81c373044b6d36eee58d2 /libs/surfaceflinger/LayerBlur.cpp | |
| parent | 42e48026b21a962e5bf40344d738665ecbd9d74d (diff) | |
| parent | ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 (diff) | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Diffstat (limited to 'libs/surfaceflinger/LayerBlur.cpp')
| -rw-r--r-- | libs/surfaceflinger/LayerBlur.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/surfaceflinger/LayerBlur.cpp b/libs/surfaceflinger/LayerBlur.cpp index efadbcf4c645..d3e456f1bf8f 100644 --- a/libs/surfaceflinger/LayerBlur.cpp +++ b/libs/surfaceflinger/LayerBlur.cpp @@ -23,6 +23,9 @@ #include <utils/Errors.h> #include <utils/Log.h> +#include <GLES/gl.h> +#include <GLES/glext.h> + #include "BlurFilter.h" #include "LayerBlur.h" #include "SurfaceFlinger.h" |