| commit | c27e7f19dc6afc9aa71054c3d1f0d4d838c873d6 | [log] [tgz] |
|---|---|---|
| author | Scott Lobdell <slobdell@google.com> | Tue Jan 22 18:03:12 2019 -0800 |
| committer | Daniel Norman <danielnorman@google.com> | Mon Jan 28 17:12:42 2019 -0800 |
| tree | 1ee477c007c5704abc7065ddcc3de7a3bcd20a3f | |
| parent | ab7040821d963923e808e20ab16eff242dd69940 [diff] | |
| parent | c1817d07df317128739f94e71e00867f68d61a7a [diff] |
Merge QP1A.190122.001 Conflicts: src/com/android/bluetooth/btservice/AdapterService.java src/com/android/bluetooth/hdp/HealthService.java tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java Change-Id: I00e80b90563abaecde2db4b54aec8510ce792d32