diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 00:26:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 00:26:36 +0000 |
| commit | 6860f2c36a30a05df621cba83de59fc7572b2889 (patch) | |
| tree | 2151ec9dbfa40fc76063e42cdc57ad79f837a205 /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | bc824d847ab853c8d811632339b934d227a420b2 (diff) | |
| parent | 3cbb8d7ff6371b9d41432c03a00616fa60fd88bf (diff) | |
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 3cbb8d7ff6 am: f01b99332b -s ours
am skip reason: subject contains skip directive
Change-Id: I25e889bad69a7a3bfd819e7a75a69a16f29b92da
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions