Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54ffb8ab authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@126645

parent cce8bd12

include/media/PVMediaRecorder.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ public: 
    status_t getMaxAmplitude(int *max);



private:

    status_t doStop();



    AuthorDriverWrapper*            mAuthorDriverWrapper;

};

include/private/opengles/gl_context.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <sys/types.h>

#include <pthread.h>

#ifdef HAVE_ANDROID_OS

#include <sys/tls.h>

#include <bionic_tls.h>

#endif



#include <private/pixelflinger/ggl_context.h>