Merge "Use correct syntax for #include <> """

#include <libsonivox/jet.h>

#include <libsonivox/eas_types.h>

#include "AudioTrack.h"

#include <media/AudioTrack.h>

namespace android {

#include <stdlib.h>

#include <string.h>

#include <new>

#include <EffectBundle.h>

#include "EffectBundle.h"

// effect_handle_t interface implementation for bass boost

#include <stdlib.h>

#include <string.h>

#include <new>

#include <EffectReverb.h>

#include <LVREV.h>

#include "EffectReverb.h"

// from Reverb/lib

#include "LVREV.h"

// effect_handle_t interface implementation for reverb

extern "C" const struct effect_interface_s gReverbInterface;

*/

#define LOG_TAG "mediaserver"

//#define LOG_NDEBUG 0

#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <utils/Log.h>

#include <AudioFlinger.h>

#include <CameraService.h>

#include <MediaPlayerService.h>

#include <AudioPolicyService.h>

// from LOCAL_C_INCLUDES

#include "AudioFlinger.h"

#include "CameraService.h"

#include "MediaPlayerService.h"

#include "AudioPolicyService.h"

using namespace android;