OSDN Git Service

Merge changes from topic 'framework-net-aosp'
authorLorenzo Colitti <lorenzo@google.com>
Fri, 9 Dec 2016 09:48:51 +0000 (09:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 09:48:51 +0000 (09:48 +0000)
commit1a2fa0f372e69fbc356b11801ba802d9b14afdcd
tree381c4443d0a5d3b956b5c8e6e44858f452be38de
parent9f65f04157496d50428dd8dba63493a8d408b17b
parentab4c79bd96281e29321edbe4121a33ad5eb12cbe
Merge changes from topic 'framework-net-aosp'
am: ab4c79bd96

Change-Id: I286110dc7db8424187d50d07fa3f059903cdea03