OSDN Git Service

Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
authorMarie Janssen <jamuraa@google.com>
Mon, 12 Dec 2016 21:34:45 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Dec 2016 21:34:45 +0000 (21:34 +0000)
commit0d60028669c51202c3fe00ba5f767e05ec555fbc
tree269d4967bcd2cc7c44fab21711d7db9c8f212cd8
parent2d38abb49a0e9afe7156bf182796a87c627e9622
parent8c11340b0c0cd40ea1b5ef83299830ae6d8c665b
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
am: 8c11340b0c  -s ours

Change-Id: I60f481691445aeb4926b177d83f39077b9a72921