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

Commit 19353c41 authored by Akwasi Boateng's avatar Akwasi Boateng Committed by Android Git Automerger
Browse files

Merge branch 'ics-mr1-plus-aosp' of... 

Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
parents ad9bb6df 5965359a

opengl/libs/EGL/egl_display.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ public: 
    inline bool isValid() const { return magic == '_dpy'; }

    inline bool isAlive() const { return isValid(); }



    inline uint32_t getRefsCount() const { return refs; }



    struct strings_t {

        char const * vendor;

        char const * version;