tree 1181b9047d48dc3b8f5341879c5c5a794bb11dab
parent a73ce0afbf4e1681ed2d47fe1913a9d297d06777
parent d4414cf278b807592cda035172b056ee0354e3ee
author John Stultz <john.stultz@linaro.org> 1529624768 -0700
committer android-build-merger <android-build-merger@google.com> 1529624768 -0700

Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"
am: d4414cf278

Change-Id: Ib0b110fd5cf07b6693213fce8a45bc7be62d71cf