am 110f705e: resolved conflicts for 832a0d1c to mnc-dev

* commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb':
  libutils: Fix integer overflows in VectorImpl.
This commit is contained in:
Brian Carlstrom 2015-09-20 01:02:27 +00:00 committed by Android Git Automerger
commit 661600dd0f

View file

@ -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>