tree 2d3a335053ad026df72c022bc86d0e19b57a96a3
parent 087c08bb7f07b106af28fd49bdac1b0a50e00013
parent 9f6f40eb9b5acf7f3b1f64645e8531eaad9ab69c
author John Stultz <john.stultz@linaro.org> 1534476141 -0700
committer android-build-merger <android-build-merger@google.com> 1534476141 -0700

Merge "HiKey960: Add sys.usb.controller override for newer kernels" am: d4b00a218c
am: 9f6f40eb9b

Change-Id: I3e053da1ad16484e01b74d49a9b34279fcc89c7b