| commit | e2206c0fd090d789912c2b59c42d467598f52128 | [log] [tgz] |
|---|---|---|
| author | Diego Wilson <diegowilson@google.com> | Thu Apr 04 13:25:12 2019 -0700 |
| committer | Scott Lobdell <slobdell@google.com> | Fri Apr 05 15:10:01 2019 -0700 |
| tree | 377c68f62aeb98ac2116779258398d01c822b3b9 | |
| parent | d6bddd21c14c4aa9a8e5d12dba54d6e82af17181 [diff] | |
| parent | 0e330752ba0ef723080861a82ff652be40f8a959 [diff] |
Merge QP1A.190404.001 Conflicts: src/com/android/bluetooth/a2dp/A2dpService.java src/com/android/bluetooth/btservice/AdapterService.java src/com/android/bluetooth/btservice/PhonePolicy.java src/com/android/bluetooth/btservice/ServiceFactory.java src/com/android/bluetooth/hfp/HeadsetPhoneState.java Change-Id: If2c92164431ba2716434f4f3d23f171310bf2781