| commit | 8eff9648b1bb1f32b43f0620257ed9025e60126d | [log] [tgz] |
|---|---|---|
| author | Bill Peckham <bpeckham@google.com> | Wed Oct 10 15:40:30 2018 -0700 |
| committer | Bill Peckham <bpeckham@google.com> | Wed Oct 10 15:40:30 2018 -0700 |
| tree | d204d727258ebb9e62188cfe402d6cd8e11332d0 | |
| parent | 70f072cb7998db83e13609330f63d1fd16911783 [diff] | |
| parent | 3002fc96ca7582f4da41a17e0604a3a3504b50a1 [diff] |
Merge P_TO_Q_5054975 Conflicts: res/values/config.xml src/com/android/bluetooth/a2dp/A2dpCodecConfig.java src/com/android/bluetooth/a2dp/A2dpService.java Change-Id: Idda0c01410d560d9ef17605b63d57aa952c3b525