tree 70132e252b68c679c5ca1c215de9eb9f7841d157
parent a4bbace0c9b3449c5ffe896de88cba1698bf7133
parent 75122c17c8c4827bf26387f2c734e65846fb5d49
author John Stultz <john.stultz@linaro.org> 1501712210 +0000
committer android-build-merger <android-build-merger@google.com> 1501712210 +0000

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

Change-Id: Iac81549da740b15209eac73df6e5add747b4bb37