diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2017-03-14 14:46:15 -0700 |
|---|---|---|
| committer | MSe <mse1969@posteo.de> | 2017-05-16 12:09:10 +0200 |
| commit | a506b2fdd21041635f0649cdfcbdf83cea54db06 (patch) | |
| tree | a8dfa03089ff624dbfaeec5c04e229f7ae50ee96 /stack/l2cap/l2c_ble.c | |
| parent | ccde045431d38d4828412149f067631487f8025f (diff) | |
| download | android_system_bt-a506b2fdd21041635f0649cdfcbdf83cea54db06.tar.gz android_system_bt-a506b2fdd21041635f0649cdfcbdf83cea54db06.tar.bz2 android_system_bt-a506b2fdd21041635f0649cdfcbdf83cea54db06.zip | |
resolve merge conflicts of a3ee2e35 to nyc-dev
Bug: 34946955
AOSP-Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
CVE-2017-0602
Change-Id: I2ef24140c3d26b3e6cf113195951fe57f61f4c1e
Diffstat (limited to 'stack/l2cap/l2c_ble.c')
0 files changed, 0 insertions, 0 deletions