diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-08-09 00:45:34 -0700 |
|---|---|---|
| committer | Jakub Pawlowski <jpawlowski@google.com> | 2017-08-09 13:03:35 +0000 |
| commit | d1d411284122b46a487beed7e1267319253d1840 (patch) | |
| tree | 0e55c7d2f865b5805d29e9fc04fc78794495b555 /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | d283fb81d20e45bc03991e2b110684c8185318e5 (diff) | |
resolve merge conflicts of 1efd8ff2a5a6 to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions