| commit | a87bbe6e4df1f28dbed9545aaf8504d7d97188ca | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Jan 13 16:01:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 13 16:01:37 2017 +0000 |
| tree | 3e48e30e1a011c7079cdd8930224075e7a7acdcc | |
| parent | 209186c063f6370a8fde317d16255484961fe82a [diff] | |
| parent | 726516527c79595831f14d02ffb06d6a91b0c30a [diff] |
Merge "trusty: use log/log.h for ALOG macros" am: dc40813167 am: 8548d54b2f am: 3d6a3d2a13 am: fd665590d5 Change-Id: Iddf206c52210a8a9d372c28c14463ca927b7d180
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>