| commit | 1c4f12c6dbf65323f549e2618da2170acf480774 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Mon Dec 12 21:46:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 12 21:46:12 2016 +0000 |
| tree | 08369635b0fd210d25e49d533207e6454c47e3d1 | |
| parent | 97069369450fcddf50b18ed948635e2e7e53a445 [diff] | |
| parent | f1342adb86951a61ca534d700793e55ddd7bc96d [diff] |
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours am: 0d60028669 -s ours am: f1342adb86 Change-Id: Ib7b4cb112fcde7e8286f24e59aa31befef56a068