OSDN Git Service

Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am...
authorLorenzo Colitti <lorenzo@google.com>
Mon, 18 Jul 2016 15:15:33 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jul 2016 15:15:33 +0000 (15:15 +0000)
commitef3ec0dd3456a3dedaaf5dd5818b8d170a788bf3
tree73e3afdf39929dd2f5fe672d4421afc21418bb5d
parent7fec09d3be8cf7f31e1b68c2d766154c052028d0
parent17450e41b36be9f1c05c5c2b7d4818f2461a52f6
Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am: b5239329b1\" into nyc-mr1-dev-plus-aosp
am: 17450e41b3

Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
services/core/java/com/android/server/ConnectivityService.java