Merge changes Iec53a9fd,Iac4cfe70 am: 29afcf0eb0 am: b0c74fb227

am: 333a70ebe5 Change-Id: Ie225d000aeafb4a0b1e3910967c619fd932f239f
2019-01-16 02:03:06 -08:00
parent da49233769 333a70ebe5
commit 3d375dbd97
9 changed files with 62 additions and 89 deletions
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -355,16 +355,6 @@ interface INetworkManagementService
     */
    void removeVpnUidRanges(int netId, in UidRange[] ranges);

-    /**
-     * Start the clatd (464xlat) service on the given interface.
-     */
-    void startClatd(String interfaceName);
-
-    /**
-     * Stop the clatd (464xlat) service on the given interface.
-     */
-    void stopClatd(String interfaceName);
-
    /**
     * Start listening for mobile activity state changes.
     */