diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-15 23:02:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 23:02:01 +0000 |
| commit | b9b86f644f47e6e3bdedc5b2419e9d4af1c8b455 (patch) | |
| tree | 8f2ca204b2d2bc842b7fc89610988c619b5253df /opengl/libs/GLES_trace/src/gltrace_egl.cpp | |
| parent | 8d129cbf5a8affebaf0883450d637132e2f9f512 (diff) | |
| parent | 4df903dbc71c48e2db6fae9390795b81782470b4 (diff) | |
| download | frameworks_native-b9b86f644f47e6e3bdedc5b2419e9d4af1c8b455.zip frameworks_native-b9b86f644f47e6e3bdedc5b2419e9d4af1c8b455.tar.gz frameworks_native-b9b86f644f47e6e3bdedc5b2419e9d4af1c8b455.tar.bz2 | |
am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
* commit '4df903dbc71c48e2db6fae9390795b81782470b4':
Revert "Revert "Update protobuf library from 2.3 to 2.6.""
Diffstat (limited to 'opengl/libs/GLES_trace/src/gltrace_egl.cpp')
| -rw-r--r-- | opengl/libs/GLES_trace/src/gltrace_egl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/GLES_trace/src/gltrace_egl.cpp b/opengl/libs/GLES_trace/src/gltrace_egl.cpp index 4f9b006..a7878f2 100644 --- a/opengl/libs/GLES_trace/src/gltrace_egl.cpp +++ b/opengl/libs/GLES_trace/src/gltrace_egl.cpp @@ -17,7 +17,7 @@ #include <cutils/log.h> #include <utils/Timers.h> -#include "gltrace.pb.h" +#include "frameworks/native/opengl/libs/GLES_trace/proto/gltrace.pb.h" #include "gltrace_context.h" #include "gltrace_fixup.h" #include "gltrace_transport.h" |