Merge "Add DhcpServer" am: e3a0f42e8e am: 7f3130c488

am: fb294eb16e

Change-Id: I602efdb3cb4b3316dada80361381404af1c3615c
This commit is contained in:
Remi NGUYEN VAN
2018-08-28 20:51:09 -07:00
committed by android-build-merger

View File

@@ -139,6 +139,8 @@ public class TrafficStats {
public static final int TAG_SYSTEM_GPS = 0xFFFFFF44; public static final int TAG_SYSTEM_GPS = 0xFFFFFF44;
/** @hide */ /** @hide */
public static final int TAG_SYSTEM_PAC = 0xFFFFFF45; public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
/** @hide */
public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFF46;
private static INetworkStatsService sStatsService; private static INetworkStatsService sStatsService;