tree df2a7509af71f47ba47ae4e9912688f11bf18e1b
parent 2483153da397380b171c690f1615a6f48485464c
parent 451850a0b17de03e252a2bae0b186470f1ba148c
author John Stultz <john.stultz@linaro.org> 1496252927 +0000
committer android-build-merger <android-build-merger@google.com> 1496252927 +0000

Merge "HiKey960: Integrate ARM's reference gralloc for mali bifrost" am: bd3238b184 am: cb4d0baa42
am: 451850a0b1

Change-Id: Ia2af4fd2276e74d5de347b9e75cb5ce9e632dbe1