OSDN Git Service

Merge "Allocate/free the SDP connection timers only during stack startup/shutdown...
authorPavlin Radoslavov <pavlin@google.com>
Fri, 12 Jan 2018 21:16:07 +0000 (21:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 21:16:07 +0000 (21:16 +0000)
commit4bea85890681076b2eddcf468dc6963e17b299f2
tree41e28f86b44d9a0ccbb71017cb7d5ff1cdffcd43
parent1339bf82c1fa0f799b3ff20ad2fdb00a718b475c
parent01c15d17373dc99630db1dd9dd82ff59a530ddc6
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am: 42fe329fea am: 7dd87869f2 am: 03c8d807be am: c0f3c28fac am: 1541631487  -s ours
am: 01c15d1737  -s ours

Change-Id: Iff9bbaea1a9db7be3c5274c35cb29f44bd33f0a0