tree 51e0277ad667984d12a16b5c78f8670a03b0714c
parent 3711f2f0c20c47d353d8163f431eb7f1d013bd73
parent 4eb075e89f84b7df6ae4fa17ee1870bdcb4b9093
author ltrochtova <ltrochtova@google.com> 1480628887 +0000
committer android-build-merger <android-build-merger@google.com> 1480628887 +0000

Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am: 4eb075e89f  -s ours

Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158