| commit | fb10aab9b3ba1e1bc91c917ade946fb52c63eaa4 | [log] [tgz] |
|---|---|---|
| author | Scott Lobdell <slobdell@google.com> | Mon Jan 07 13:44:43 2019 -0800 |
| committer | Steven Laver <lavers@google.com> | Thu Jan 17 14:47:20 2019 -0800 |
| tree | 3e52f1dfe662676774d274ce201f428d205c2378 | |
| parent | 730b107a5ac2c3cb8c43dcb4dc1a973fb7494275 [diff] | |
| parent | ad87488517211c2b65a171d74fd4eb547d77297e [diff] |
Merge QP1A.190107.001 Conflicts: Android.mk src/com/android/bluetooth/a2dp/A2dpService.java src/com/android/bluetooth/btservice/ActiveDeviceManager.java src/com/android/bluetooth/btservice/AdapterService.java Change-Id: I76eae003ce30270e745ed4508c5f21105dad3fce