Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours

am: 0d60028669  -s ours

Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9
This commit is contained in:
Marie Janssen
2016-12-12 21:40:16 +00:00
committed by android-build-merger

Diff Content Not Available