diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2012-06-28 15:25:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-28 15:25:01 -0700 |
| commit | ad85f0df686348d85b2f81aa76c405c53e46674d (patch) | |
| tree | b04fdf0ac7559ead0c43aa41fa3b3d37ac20081a /camera/MemoryManager.cpp | |
| parent | d2b5a4a00c5edc558698ac83bcbb5ca8ee30a167 (diff) | |
| parent | 4a35937fcb950ccd05af56c49214b88e393233e3 (diff) | |
| download | hardware_ti_omap4xxx-ad85f0df686348d85b2f81aa76c405c53e46674d.zip hardware_ti_omap4xxx-ad85f0df686348d85b2f81aa76c405c53e46674d.tar.gz hardware_ti_omap4xxx-ad85f0df686348d85b2f81aa76c405c53e46674d.tar.bz2 | |
Merge "Put back old ion library"
Diffstat (limited to 'camera/MemoryManager.cpp')
| -rw-r--r-- | camera/MemoryManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/MemoryManager.cpp b/camera/MemoryManager.cpp index b1dbbcf..8631bbd 100644 --- a/camera/MemoryManager.cpp +++ b/camera/MemoryManager.cpp @@ -24,7 +24,7 @@ extern "C" { -#include <ion/ion.h> +#include <ion.h> //#include <timm_osal_interfaces.h> //#include <timm_osal_trace.h> |