diff options
| author | Andrew Solovay <asolovay@google.com> | 2018-10-04 14:59:09 -0700 |
|---|---|---|
| committer | Andrew Solovay <asolovay@google.com> | 2018-10-04 22:50:39 +0000 |
| commit | f636c901d9b4d09b27652a779fbde1d9949a1665 (patch) | |
| tree | 5161008b4df535843c6e97b4c9e11ed2f3171aef /framework/java/android/bluetooth/BluetoothCodecConfig.java | |
| parent | 8381a0f4acd614acf1fb5cf83682af46ecbe56dd (diff) | |
| parent | ee9e4f6b77d8b9ecd011177e1e6cbd62e0ff2d77 (diff) | |
resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothCodecConfig.java')
0 files changed, 0 insertions, 0 deletions