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

am: 46eb3f6cdb

Change-Id: Ib65ebb040db72ada2286e73a0d0d5b8c88f88814
This commit is contained in:
ltrochtova
2016-12-01 22:36:08 +00:00
committed by android-build-merger

Diff Content Not Available