tree 70132e252b68c679c5ca1c215de9eb9f7841d157
parent a3fc4fd2baa2f475ac488b23caecd439d19baa59
parent dee7b99b88961bc2636f7cbae836dbe8dbb1b546
author John Stultz <john.stultz@linaro.org> 1501711962 +0000
committer android-build-merger <android-build-merger@google.com> 1501711962 +0000

Merge "hikey960.mk: Enable the common linux bluetooth HAL for 4.9+ kernels" am: f96b276b4c am: 143a476a4c am: 5717cc9264
am: dee7b99b88

Change-Id: Iee1d9e3b1247bcca062099b6cdcb233ac4f324c3