diff options
| author | Arthur Hsu <arthurhsu@google.com> | 2018-01-18 18:30:23 -0800 |
|---|---|---|
| committer | Arthur Hsu <arthurhsu@google.com> | 2018-01-18 18:30:44 -0800 |
| commit | 40c70ba045412e09aeb3c6d279cc0116306cb0df (patch) | |
| tree | 95fda098ff019f8eb84aab3a4883225028bb9d14 /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | ced5ce1b6aaba44191692b0e0faabbf4f45f351a (diff) | |
| parent | 034baa13418723d9618f821b8a11fa9e059902ed (diff) | |
resolve merge conflicts of 034baa13418723d9618f821b8a11fa9e059902ed to
master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I095f92ed3607616a7147a23f1fd9cd65b72e921b
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions