tag | 3bc968cbe484df7eb39a2cdd3a8fb7d9694829f4 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Jan 23 22:56:11 2017 |
object | 472271b153c5dc53c28beac55480a8d8434b2d5c |
Android 6.0.1 Release 78 (MOB31S)
commit | 472271b153c5dc53c28beac55480a8d8434b2d5c | [log] [tgz] |
---|---|---|
author | Sharvil Nanavati <sharvil@google.com> | Tue Jun 21 02:16:12 2016 |
committer | Zach Jang <zachjang@google.com> | Wed Jun 22 23:28:31 2016 |
tree | 9112405a19254acdd7e1b37b4d667135cc0e2764 | |
parent | 514139f4b40cbb035bb92f3e24d5a389d75db9e6 [diff] |
DO NOT MERGE Fix potential DoS caused by delivering signal to BT process Bug: 28885210 Change-Id: I63866d894bfca47464d6e42e3fb0357c4f94d360 Conflicts: btif/co/bta_hh_co.c btif/src/btif_core.c Merge conflict resolution of ag/1161415 (referencing ag/1164670) - Directly into mnc-mr2-release