tree 1a6cd7f75918b5c33da18c6b23b78ca7352c7cac
parent 548c87d55dbc34283a5cb2a3b0bbf3cd5a75b1ed
parent fb66ad7df473a64c7ae6661e3fbeba210f1cea5f
author Philip Cuadra <philipcuadra@google.com> 1493226647 +0000
committer android-build-merger <android-build-merger@google.com> 1493226647 +0000

Merge "Allow Bluetooth HAL CAP_SYS_NICE" am: 1ac29896b0 am: adecf17de6
am: fb66ad7df4

Change-Id: Ida2eced4f78292df5886a3c35c9d2230db3da613