Merge "ADD new enum NetworkType to identify multiple transport type" am:...

    NT_BLUETOOTH = 3;

    NT_BLUETOOTH = 3;

    // Indicates this network uses an Ethernet transport.

    // Indicates this network uses an Ethernet transport.

    NT_ETHERNET = 4;

    NT_ETHERNET = 4;

    // Indicates this network uses a VPN transport.

    // Indicates this network uses a VPN transport, now deprecated.

    NT_VPN = 5;

    NT_VPN = 5 [deprecated=true];

    // Indicates this network uses a Wi-Fi Aware transport.

    // Indicates this network uses a Wi-Fi Aware transport.

    NT_WIFI_AWARE = 6;

    NT_WIFI_AWARE = 6;

    // Indicates this network uses a LoWPAN transport.

    // Indicates this network uses a LoWPAN transport.

    NT_LOWPAN = 7;

    NT_LOWPAN = 7;

    // Indicates this network uses a Cellular+VPN transport.

    NT_CELLULAR_VPN = 8;

    // Indicates this network uses a Wi-Fi+VPN transport.

    NT_WIFI_VPN = 9;

    // Indicates this network uses a Bluetooth+VPN transport.

    NT_BLUETOOTH_VPN = 10;

    // Indicates this network uses an Ethernet+VPN transport.

    NT_ETHERNET_VPN = 11;

}

}

enum CacheStatus{

enum CacheStatus{