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

Commit 110f705e authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

resolved conflicts for 832a0d1c to mnc-dev

Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
parents c609c31f 832a0d1c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

#define LOG_TAG "Vector_test"

#define __STDC_LIMIT_MACROS
#include <stdint.h>
#include <utils/Vector.h>
#include <cutils/log.h>
#include <gtest/gtest.h>