tree 68d1a05b32b1b23a7a1332400750b8f5d888e42b
parent 451850a0b17de03e252a2bae0b186470f1ba148c
parent e2973ab19063f56817ab7a7cf9ad290e2c27baa5
author John Stultz <john.stultz@linaro.org> 1496253227 +0000
committer android-build-merger <android-build-merger@google.com> 1496253227 +0000

Merge "HiKey960: Properly integrate mali bifrost gralloc for HiKey960" am: 4e1429c146
am: e2973ab190

Change-Id: I41461d7725c82f27179524ae95f2e294b58112e6