tree e77cf408b726ea303b8d58c73acfb09984d391bc
parent 26150bd0bf400582654694ecccb0e65cddec3cff
parent 72e15a43c38f435dad4e73b627c2b0b490fecc97
author John Stultz <john.stultz@linaro.org> 1531337093 -0700
committer android-build-merger <android-build-merger@google.com> 1531337093 -0700

Merge "hikey960: Add version check on the hisi vdec package" am: 7c2f3413d0
am: 72e15a43c3

Change-Id: I04e0081fdfebb6c2db0ce1931c0ba7027ceefc2c