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

am: 834725f579

Change-Id: Idda7a70676bb3d6ac028482064c22e61180768f6
This commit is contained in:
ltrochtova
2016-12-01 21:57:04 +00:00
committed by android-build-merger

Diff Content Not Available