tree b6718477f524d19538eb72066aaf21d428f9b032
parent b52989c736b3278f1ab5f6a9db8e555f40b99585
parent 964f769d63e120ce93c338a78bbf642366fec1ec
author Marie Janssen <jamuraa@google.com> 1481578810 +0000
committer android-build-merger <android-build-merger@google.com> 1481578810 +0000

Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0  -s ours
am: 964f769d63  -s ours

Change-Id: I3bf8b667f00da5c517d382a7e710b1556a41116e