OSDN Git Service

Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 22:20:40 +0000 (22:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 22:20:40 +0000 (22:20 +0000)
commit0bde9c43555b020c6cfae621580afc00c1834021
tree5788308e3b9aa6cb333ccc5bff2869a375a9be4b
parent954ba2c6a1671b75cd1e588e0b5f0ccb4b3abc61
parent65bbfa1c6c31fb143772955726034b6551c1aa45
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d am: 5ba62a2194" into oc-mr1-dev-plus-aosp