summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-10-19 02:28:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-19 02:28:09 +0000
commit0219856e5e45c0bdd20f2199297ec92f11f0875f (patch)
tree3791d970dc0420e6a6d89177af1fc25bf103c321
parentab70649e2b0ea3d917242814417ec5711f4cb811 (diff)
parent6e2884495babd1163c0eed1b9233c81c2dae1fb8 (diff)
downloadframeworks_av-0219856e5e45c0bdd20f2199297ec92f11f0875f.zip
frameworks_av-0219856e5e45c0bdd20f2199297ec92f11f0875f.tar.gz
frameworks_av-0219856e5e45c0bdd20f2199297ec92f11f0875f.tar.bz2
Merge "libvideoeditor: fix M4OSA_Clock header guard"
-rwxr-xr-xlibvideoeditor/osal/inc/M4OSA_Clock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvideoeditor/osal/inc/M4OSA_Clock.h b/libvideoeditor/osal/inc/M4OSA_Clock.h
index db753a5..52ea696 100755
--- a/libvideoeditor/osal/inc/M4OSA_Clock.h
+++ b/libvideoeditor/osal/inc/M4OSA_Clock.h
@@ -21,7 +21,7 @@
************************************************************************
*/
-#ifndef M4OSA_CLOCH_H
+#ifndef M4OSA_CLOCK_H
#define M4OSA_CLOCK_H
#include "M4OSA_Types.h"