| commit | 3d6a3d2a130fe2bec98a4a24f664b630fa808392 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Jan 13 15:44:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 13 15:44:36 2017 +0000 |
| tree | 513fd2396334c7b1d16e00d62cb980d6a2d4a7fc | |
| parent | c87d4ce75890a27ec16c04d0bdd0be8d8ee605c8 [diff] | |
| parent | 8548d54b2ffbe921a7f7667e5644586ec9958a85 [diff] |
Merge "trusty: use log/log.h for ALOG macros" am: dc40813167 am: 8548d54b2f Change-Id: Ibb9c38532e779a322858c5f018f713f46d065f3c
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>