| commit | afd2c5ed0110821b557fd04a913d89810e828cc3 | [log] [tgz] |
|---|---|---|
| author | Eric Arseneau <earseneau@google.com> | Wed May 16 08:49:58 2018 -0700 |
| committer | Eric Arseneau <earseneau@google.com> | Wed May 16 08:49:58 2018 -0700 |
| tree | 4e435e41fcb1e045d517d6a05f90077097cc3945 | |
| parent | 45c673db43ef2014adfdc9d21ae6ff64fb772961 [diff] | |
| parent | 68b2926221ab627bb4baffc77c72f25ac9ec2f21 [diff] |
Merge PPR1.180516.001 Conflicts: src/com/android/bluetooth/btservice/AdapterState.java src/com/android/bluetooth/hfp/HeadsetService.java src/com/android/bluetooth/hfp/HeadsetStateMachine.java Change-Id: I2b19cb539aab734508b6bd552fcdb9fc388a9a62