OSDN Git Service

Merge "Nat464Xlat: interface notification handler on ConnectivityService" am: 91817b3...
authorHugo Benichi <hugobenichi@google.com>
Tue, 29 Aug 2017 05:42:07 +0000 (05:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Aug 2017 05:42:07 +0000 (05:42 +0000)
commit102161ccb2dc4554fb601f0148e173ebf1fcef4c
tree10bb5258b9439c4d31b7ef7669f575ce3e7a1a40
parent1f9f8597e90de17c04bce471a794789e299d7631
parentf55c1ae9b63641abfc6358aae729e51974f99c82
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am: 91817b3129 am: 02f6cfa49e
am: f55c1ae9b6

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