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

Commit 5e931d88 authored by Dan Albert's avatar Dan Albert
Browse files

resolve merge conflicts of e221e013 to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a210220bffd2c3e77f503413946c35fc0d36ffb
parents 7dedb284 e221e013

cmds/dumpstate/DumpstateInternal.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "DumpstateInternal.h"



#include <errno.h>

#include <grp.h>

#include <pwd.h>

#include <stdint.h>

opengl/libs/EGL/BlobCache.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "BlobCache.h"



#include <errno.h>

#include <inttypes.h>



#include <cutils/properties.h>