commit 3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c
author Nick Kralevich <nnk@google.com> Fri Oct 18 19:32:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 18 19:32:44 2013 -0700
tree 63d52345740434a0e4765ad408f2d5279eb7b4f2
parent 77177fa20773d02b4f9c4147ecb98107f019fa7d
parent 998c4e88f962336472c5e1c3afbf0ed8d6d3a971

am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"

* commit '998c4e88f962336472c5e1c3afbf0ed8d6d3a971':
  libvideoeditor: fix M4OSA_Clock header guard

libvideoeditor/osal/inc/M4OSA_Clock.h

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"