tree f1037bb30c0e6f0baf27b47881e7c467082c3b70
parent b1914ebb5041623a9d8c2fa542c6f58e71690951
parent dedc04978e2e4770b8e98b6e554e025a9696687d
author Philip Cuadra <philipcuadra@google.com> 1493252799 +0000
committer android-build-merger <android-build-merger@google.com> 1493252799 +0000

Merge "Allow Bluetooth CAP_SYS_NICE" am: ebc94ecac9
am: dedc04978e

Change-Id: I5fa80631fe566771525a94c54d8cbbe543b783e0