summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorElliott Hughes2017-10-17 16:57:49 -0500
committerandroid-build-merger2017-10-17 16:57:49 -0500
commita3524a255f7e460309950b2869cadb42ec47ffd2 (patch)
tree2f6174d1ac7f921af1ba1108896a2b4ae4c07423 /trusty
parent486dc4a497f280ca2aa9a7b610268a66f145ee0b (diff)
parent314ddcd9a30ddfbc6f872cbae7712154470f5c60 (diff)
downloadplatform-system-core-a3524a255f7e460309950b2869cadb42ec47ffd2.tar.gz
platform-system-core-a3524a255f7e460309950b2869cadb42ec47ffd2.tar.xz
platform-system-core-a3524a255f7e460309950b2869cadb42ec47ffd2.zip
resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926
am: 314ddcd9a3 Change-Id: I4fee960013f5539d85613eb09e365ee580ed1745
Diffstat (limited to 'trusty')
-rw-r--r--trusty/storage/tests/main.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/trusty/storage/tests/main.cpp b/trusty/storage/tests/main.cpp
index 1fd6f8ddc..45291360d 100644
--- a/trusty/storage/tests/main.cpp
+++ b/trusty/storage/tests/main.cpp
@@ -16,7 +16,6 @@
16 16
17#include <assert.h> 17#include <assert.h>
18#include <stdint.h> 18#include <stdint.h>
19#include <stdbool.h>
20#include <gtest/gtest.h> 19#include <gtest/gtest.h>
21 20
22#include <trusty/lib/storage.h> 21#include <trusty/lib/storage.h>