| commit | f1342adb86951a61ca534d700793e55ddd7bc96d | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Mon Dec 12 21:40:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 12 21:40:16 2016 +0000 |
| tree | 9969d094338e96f4ecaec6465e6a308f80479ea9 | |
| parent | 2366d4dcfdad0794938fd06fec3764ebc4f4ea83 [diff] | |
| parent | 0d60028669c51202c3fe00ba5f767e05ec555fbc [diff] |
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours am: 0d60028669 -s ours Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9