diff options
| author | Nick Kralevich <nnk@google.com> | 2013-10-18 19:35:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-18 19:35:38 -0700 |
| commit | c5cc798e7233b9d089b576e2e110d02048b4c1c8 (patch) | |
| tree | 02c983b7e16aead111e836b2b7d2c4dcb3bb7326 | |
| parent | a153b68f2260a8ed7fbb236fa659b13264ac5ac0 (diff) | |
| parent | 3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c (diff) | |
| download | frameworks_av-c5cc798e7233b9d089b576e2e110d02048b4c1c8.zip frameworks_av-c5cc798e7233b9d089b576e2e110d02048b4c1c8.tar.gz frameworks_av-c5cc798e7233b9d089b576e2e110d02048b4c1c8.tar.bz2 | |
am 3f93c8f8: am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c':
libvideoeditor: fix M4OSA_Clock header guard
| -rwxr-xr-x | libvideoeditor/osal/inc/M4OSA_Clock.h | 2 |
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" |