| commit | 262cd4536f04a55f51c6a60281fe4ca791a4667b | [log] [tgz] |
|---|---|---|
| author | Diego Wilson <diegowilson@google.com> | Fri May 31 15:12:44 2019 -0700 |
| committer | Diego Wilson <diegowilson@google.com> | Fri May 31 15:12:44 2019 -0700 |
| tree | 46a4d0b690eabd18fb8a50d9b30592f3d6a5c0c4 | |
| parent | 421c3dbfbc74e75b427ff94519a06055f768ad33 [diff] | |
| parent | 9a41b5aa77c7aa8ac3265f268d5b31cee88658c4 [diff] |
Merge QP1A.190530.001 Conflicts: tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java Change-Id: I9d3ed4a93f728faad99af996cd9f8c6ed9de7163