tree 1181b9047d48dc3b8f5341879c5c5a794bb11dab
parent 6b4ed155c57ccef030df53d0613cf5de6a4e7a73
parent da55c5fd2ae87b39116ba2b3235f9749fcde6492
author John Stultz <john.stultz@linaro.org> 1529625036 -0700
committer android-build-merger <android-build-merger@google.com> 1529625036 -0700

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

Change-Id: Ia0ef3447825b95230854b9f3f9472c1bd4431acc