resolved conflicts for 832a0d1c
to mnc-dev
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
This commit is contained in:
commit
110f705e10
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue