tag | 799a647297ab628cc6c363f01da1f5392630e733 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 01 15:18:23 2016 -0700 |
object | 42349aae6efe377fd84e271172ff380287342f45 |
Android 6.0.1 Release 62 (MTC20F)
commit | 42349aae6efe377fd84e271172ff380287342f45 | [log] [tgz] |
---|---|---|
author | Sharvil Nanavati <sharvil@google.com> | Mon Jun 20 19:16:12 2016 -0700 |
committer | Zach Jang <zachjang@google.com> | Thu Jun 23 21:02:33 2016 +0000 |
tree | af458375c1ff46c44c82be8d4a73c674ea88714e | |
parent | 10f25d9ee2de4ae03282f277fb5edd93bccd62ce [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 Change-Id: Ic4aeded2cb915c5b30c52a4db66ee99d2931369e