OSDN Git Service

Merge changes I0cd83a93,I03ae2bbb into pi-dev
authorChalard Jean <jchalard@google.com>
Tue, 24 Apr 2018 10:02:11 +0000 (03:02 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Apr 2018 10:02:11 +0000 (03:02 -0700)
commita4eec2cefa650b63eb2c1a265e32e9c1a1fc8f72
treef89abd561c1778fa366a44cdc8b41d9572816954
parent0744f1d4b1fa321adfdad7c3fc7be6578e734023
parent411e79b8b0066f146735b961301670a9c9998ed4
Merge changes I0cd83a93,I03ae2bbb into pi-dev
am: 411e79b8b0

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