diff options
| author | Daniel Mentz <danielmentz@google.com> | 2018-03-20 11:19:39 -0700 |
|---|---|---|
| committer | Daniel Mentz <danielmentz@google.com> | 2018-03-20 17:55:45 -0700 |
| commit | 78efde6a7b70faf8ac933b2ef649d252e86592e3 (patch) | |
| tree | c7832a42fd70603f62e76677f6d3dceb49beabb3 /gralloc/gr_priv_handle.h | |
| parent | 00b6586a5f7bc0381137fc1edf48813186d9e342 (diff) | |
| parent | af258e6e07ee239a601164acc51312e7f5815be0 (diff) | |
| download | display-78efde6a7b70faf8ac933b2ef649d252e86592e3.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.203' into pi-dev
Conflicts:
gralloc/gr_priv_handle.h
Bug: 75978020
Change-Id: I01b5024291614ec49da247a9ae283c7bb5283e03
Diffstat (limited to 'gralloc/gr_priv_handle.h')
| -rw-r--r-- | gralloc/gr_priv_handle.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gralloc/gr_priv_handle.h b/gralloc/gr_priv_handle.h index addaecf5..ae76e6a9 100644 --- a/gralloc/gr_priv_handle.h +++ b/gralloc/gr_priv_handle.h @@ -21,8 +21,7 @@ #define __GR_PRIV_HANDLE_H__ #include <errno.h> - -#include <cutils/log.h> +#include <log/log.h> #include <hardware/gralloc.h> #include <hardware/gralloc1.h> #include <cinttypes> |