OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 853d626 2846034)
Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9-mnc-dev" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)
* changes:
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f am: fdcc979af8 am: fa184a2b3b am: d200b0fe25 am: 6f4c3dc7e6 skipped: ce6180d204
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f am: fdcc979af8 am: fa184a2b3b am: d200b0fe25 am: 6f4c3dc7e6
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f am: fdcc979af8 am: fa184a2b3b am: d200b0fe25
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f am: fdcc979af8 am: fa184a2b3b
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f am: fdcc979af8
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78
  DO NOT MERGE Fix OOB read in process_l2cap_cmd


Trivial merge
system/bt
About OSDN
Find Software
Develop Software
Help