OSDN Git Service

Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0 -s...
authorMarie Janssen <jamuraa@google.com>
Mon, 12 Dec 2016 21:40:10 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Dec 2016 21:40:10 +0000 (21:40 +0000)
commit2e4d0c765f4c47124e4ae1950c16b378ba9c1dee
treeb6718477f524d19538eb72066aaf21d428f9b032
parentb52989c736b3278f1ab5f6a9db8e555f40b99585
parent964f769d63e120ce93c338a78bbf642366fec1ec
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0  -s ours
am: 964f769d63  -s ours

Change-Id: I3bf8b667f00da5c517d382a7e710b1556a41116e