diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-04 15:16:50 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-06 00:34:54 +0100 |
| commit | c962bf8b8fa4d9a6400811296fb270f47db68cf4 (patch) | |
| tree | f5e651935cbbf54e6d1488bbe19a6e2a4599a070 /libgralloc/alloc_controller.cpp | |
| parent | 7a8a513ac8a2b9a76b36cf1341d45b00d88ed45c (diff) | |
| parent | 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78 (diff) | |
| download | hardware_qcom_display-cm-10.1.tar.gz hardware_qcom_display-cm-10.1.tar.bz2 hardware_qcom_display-cm-10.1.zip | |
Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1
Change-Id: I44a10eaa285d0521669781a4fafb7641df209186
Diffstat (limited to 'libgralloc/alloc_controller.cpp')
| -rw-r--r-- | libgralloc/alloc_controller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp index e4d1d689d..6bc23de25 100644 --- a/libgralloc/alloc_controller.cpp +++ b/libgralloc/alloc_controller.cpp @@ -29,7 +29,7 @@ #include <cutils/log.h> #include <fcntl.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "alloc_controller.h" #include "memalloc.h" #include "ionalloc.h" |