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 /liblight | |
| 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 'liblight')
| -rw-r--r-- | liblight/lights.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/liblight/lights.c b/liblight/lights.c index de720a20..93a0f95f 100644 --- a/liblight/lights.c +++ b/liblight/lights.c @@ -19,7 +19,7 @@ // #define LOG_NDEBUG 0 -#include <cutils/log.h> +#include <log/log.h> #include <cutils/properties.h> #include <stdint.h> |