tree 8d282f341cc6aa6cedf466516a4e52aac68f5b14
parent fda66672fedf73d08d9061a2823ec7bd2c9cd774
parent 41319ff65f0bb52623b7acbe967b808758372d0d
author Marie Janssen <jamuraa@google.com> 1477624956 +0000
committer android-build-merger <android-build-merger@google.com> 1477624956 +0000

Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b  -s ours am: 98f664b903 am: 7ad32238f6
am: 41319ff65f

Change-Id: I810a42d85002b0fe40c005f2065b2e701ea8c5cf