diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-12 19:46:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-12 19:46:11 +0000 |
| commit | 7581a96bfd9219030a8ae8a15f545da0d7eccdda (patch) | |
| tree | 193f7be9b2669eb58527da7080e1e5924fd26a0f /opengl/libs/GLES_trace/src/gltrace_api.cpp | |
| parent | d8dc9405c3d5bb2cc20950ed8d6fe25c1239e8e1 (diff) | |
| parent | 9200d4e3bf0bf9bf21d9bb335e04818364bf12a8 (diff) | |
| download | frameworks_native-7581a96bfd9219030a8ae8a15f545da0d7eccdda.zip frameworks_native-7581a96bfd9219030a8ae8a15f545da0d7eccdda.tar.gz frameworks_native-7581a96bfd9219030a8ae8a15f545da0d7eccdda.tar.bz2 | |
am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."
* commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8':
Update protobuf library from 2.3 to 2.6.
Diffstat (limited to 'opengl/libs/GLES_trace/src/gltrace_api.cpp')
| -rw-r--r-- | opengl/libs/GLES_trace/src/gltrace_api.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/GLES_trace/src/gltrace_api.cpp b/opengl/libs/GLES_trace/src/gltrace_api.cpp index eed3ccf..d83b9b4 100644 --- a/opengl/libs/GLES_trace/src/gltrace_api.cpp +++ b/opengl/libs/GLES_trace/src/gltrace_api.cpp @@ -19,7 +19,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" |