OSDN Git Service

Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf am: 0cf31d4d6d
authorLorenzo Colitti <lorenzo@google.com>
Tue, 15 Aug 2017 02:34:30 +0000 (02:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 02:34:30 +0000 (02:34 +0000)
commitd14c1771360b6ad16f7128d2b412b9998482888d
tree9652eec91a26118faf8f1ef8d35dcd7fd9153e43
parent3ce8557db0ec55e23d110db80d2359bdde97902d
parent20fa45e3a91216b13680efca764ac455b488d176
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf am: 0cf31d4d6d
am: 20fa45e3a9

Change-Id: I5d700c9818a89ba3eaab8a34bb799ae7145dbd28
services/core/java/com/android/server/NetworkManagementService.java