OSDN Git Service

Merge changes from topic 'framework-net-aosp' am: ab4c79bd96
authorLorenzo Colitti <lorenzo@google.com>
Fri, 9 Dec 2016 10:18:11 +0000 (10:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 10:18:11 +0000 (10:18 +0000)
commit4925138b8a7a3dd3423330e8424fcf79034046e0
tree77aaa63b9205642ad9694a81c2e9a1b574c1d787
parent1ef8d5cdd85e4d5d0a30351c439d94f459c38b0b
parent1a2fa0f372e69fbc356b11801ba802d9b14afdcd
Merge changes from topic 'framework-net-aosp' am: ab4c79bd96
am: 1a2fa0f372

Change-Id: I746ee7fd37946df2ba31ca8aee928fa3ef04591c