diff options
| author | Nick Kralevich <nnk@google.com> | 2013-10-18 19:30:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-18 19:30:45 -0700 |
| commit | 998c4e88f962336472c5e1c3afbf0ed8d6d3a971 (patch) | |
| tree | ecfcc2f84c5fb97754559ab6e980474be15a77e4 /libvideoeditor | |
| parent | 6c63fe0fdb33e5e7eb8c89f2420262b072cdd83f (diff) | |
| parent | 0219856e5e45c0bdd20f2199297ec92f11f0875f (diff) | |
| download | frameworks_av-998c4e88f962336472c5e1c3afbf0ed8d6d3a971.zip frameworks_av-998c4e88f962336472c5e1c3afbf0ed8d6d3a971.tar.gz frameworks_av-998c4e88f962336472c5e1c3afbf0ed8d6d3a971.tar.bz2 | |
am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '0219856e5e45c0bdd20f2199297ec92f11f0875f':
libvideoeditor: fix M4OSA_Clock header guard
Diffstat (limited to 'libvideoeditor')
| -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" |