commit | 4d96977c4a10237f449743e2c888d837fd4526cf | [log] [tgz] |
---|---|---|
author | Scott Lobdell <slobdell@google.com> | Tue Feb 19 23:41:46 2019 -0800 |
committer | Daniel Norman <danielnorman@google.com> | Thu Feb 21 10:47:27 2019 -0800 |
tree | 519c8f253550c11b79eeb061aa98a5e1db2938b1 | |
parent | 248371378a20908de95e40174b0bde3f8123e671 [diff] | |
parent | aacb339b3dd938f420e97a6a4043d06127188429 [diff] |
Merge QP1A.190219.001 Conflicts: src/com/android/bluetooth/a2dp/A2dpService.java Change-Id: Ieca8541e93000761ff60a2443e01f13b284186cb