OSDN Git Service

Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334 am: 69a28066bd
authorErik Kline <ek@google.com>
Thu, 21 Sep 2017 12:06:05 +0000 (12:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 12:06:05 +0000 (12:06 +0000)
commit573959665979f60fc526f0d2e9851e275fe508e6
tree1e11004c53d21aa04cd743ba5a6d5ebd945b3648
parent8bc2569538887ee28a4d71fbac075a4125f914b8
parent1347ac810918e7db158f459824d372a2e96d4ee5
Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334 am: 69a28066bd
am: 1347ac8109

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