diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-20 13:23:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-20 13:23:43 +0000 |
| commit | 7886c856a899b2b7cd9bd3544e826f4b9b74dfc0 (patch) | |
| tree | 01395daf0ede12e46a51c3c5a0eb3428fcf3834d /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | d6cc3d43210c0e863d31abf4211b4b24dbc80678 (diff) | |
| parent | 61c3851140d76bc750b82afb602e4128fbc1e822 (diff) | |
[automerger skipped] Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" am: 09170fdb8a -s ours
am skip reason: Merged-In I3e99c59e0cb974409291e1b4c28393106784e133 with SHA-1 d6cc3d4321 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1820432
Change-Id: Ia2f296def970b74ad91465e1d70f51d0db76ffe2
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions