| commit | 4db427ca57aa5444b74604f5a7f0c7bd44e9b2c4 | [log] [tgz] |
|---|---|---|
| author | Michael Schwartz <schwartzmi@google.com> | Tue May 22 10:38:05 2018 -0700 |
| committer | Michael Schwartz <schwartzmi@google.com> | Tue May 22 20:45:59 2018 -0700 |
| tree | 1c6f4dbd51cdba072f033fc65ecaaaaf4506d7aa | |
| parent | 1785a3bf5ea5e5bf467a7cf546a24ee9eabbc2e1 [diff] | |
| parent | e7fa1b09b9eff7626b40b088456541ba69ea3176 [diff] |
Merge PPR1.180522.001
Conflicts:
src/com/android/bluetooth/btservice/PhonePolicy.java
src/com/android/bluetooth/hfp/HeadsetService.java
src/com/android/bluetooth/hfp/HeadsetStateMachine.java
Change-Id: Ib115ef65345aacb861d8a34994c451f49cbe8e20