| commit | 726516527c79595831f14d02ffb06d6a91b0c30a | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Jan 13 15:56:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 13 15:56:20 2017 +0000 |
| tree | 5df79f5913f51c1f5ee88f0ed9f2a0f3415d6db9 | |
| parent | c0cfe38ef785259592846d957fa03e68c8977b37 [diff] | |
| parent | ea25332df3a407e182d0d4d149dfe6b521475308 [diff] |
Merge "trusty: use log/log.h for ALOG macros" am: dc40813167 am: 8548d54b2f am: 3d6a3d2a13 Change-Id: Idbd1c1556d3867c9b9a0247c845530b2cb16fc47
diff --git a/trusty/storage/proxy/log.h b/trusty/storage/proxy/log.h index 3d2e654..c81beab 100644 --- a/trusty/storage/proxy/log.h +++ b/trusty/storage/proxy/log.h
@@ -16,5 +16,5 @@ #define LOG_TAG "storageproxyd" -#include <android/log.h> +#include <log/log.h>