am 55d2aa7d: am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"

* commit '55d2aa7dd5bf7d8a7b942632619bde13324ee903':
  Fix OpenSLES_AndroidConfiguration.h to be usable for C code
This commit is contained in:
Andrew Hsieh
2013-03-14 13:41:02 -07:00
committed by Android Git Automerger

View File

@@ -19,6 +19,7 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Android AudioRecorder configuration */ /* Android AudioRecorder configuration */
@@ -63,6 +64,7 @@ extern "C" {
#ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */