OSDN Git Service

Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa am: 3b90fd...
authorAndre Eisenbach <eisenbach@google.com>
Thu, 17 Aug 2017 00:59:38 +0000 (00:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 00:59:38 +0000 (00:59 +0000)
commit52021958c39cfb8b4d3bd11b36f515c6c172e4bd
tree03d819c846ae74e5e45416ae7d04d30c9895ee88
parentc423ac86146d69ccfefe2380142a80fd76d3d865
parent3770ea312fd93d1fcc6365896d82e3a93a87a01f
Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa am: 3b90fd7b0c am: 33aee8d11e am: d772aec66b am: c8d256c052  -s ours am: 7fe92a7abf  -s ours am: 65fc86d417  -s ours" into oc-dr1-dev-plus-aosp
am: 3770ea312f  -s ours

Change-Id: I032593e083e9b169cad0c0aaa4587c4d3d9080a4