| commit | 12eafaf448ca8a0e8198f67089c22d68ade8cd4c | [log] [tgz] |
|---|---|---|
| author | Diego Wilson <diegowilson@google.com> | Wed Dec 19 16:00:57 2018 -0800 |
| committer | Diego Wilson <diegowilson@google.com> | Wed Dec 19 16:00:57 2018 -0800 |
| tree | 96e35e9680d3159f0f1eb4e330e10c7d01fc1b6f | |
| parent | 5bf060ed559e65fe31c939e8e3427b470d5e0970 [diff] | |
| parent | 0b049a9cfdb97c1b7eeca35b9d2d935ddd37a727 [diff] |
Merge p-keystone-qcom Conflicts: src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java src/com/android/bluetooth/pbap/BluetoothPbapService.java Change-Id: Iaad4680017fdff063bc227fa020cdc0b63291646