diff options
| author | Elliott Hughes <enh@google.com> | 2017-10-17 21:57:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-17 21:57:49 +0000 |
| commit | a3524a255f7e460309950b2869cadb42ec47ffd2 (patch) | |
| tree | 2f6174d1ac7f921af1ba1108896a2b4ae4c07423 /trusty | |
| parent | 486dc4a497f280ca2aa9a7b610268a66f145ee0b (diff) | |
| parent | 314ddcd9a30ddfbc6f872cbae7712154470f5c60 (diff) | |
| download | system_core-a3524a255f7e460309950b2869cadb42ec47ffd2.tar.gz system_core-a3524a255f7e460309950b2869cadb42ec47ffd2.tar.bz2 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.cpp | 1 |
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 @@ #include <assert.h> #include <stdint.h> -#include <stdbool.h> #include <gtest/gtest.h> #include <trusty/lib/storage.h> |