diff options
| author | 2019-06-17 15:56:24 +0000 | |
|---|---|---|
| committer | 2019-06-17 15:56:24 +0000 | |
| commit | f4c10e8bc26699a7e8efaebfd0d617aca9cb7718 (patch) | |
| tree | edf040a7c7acc2c8e2147070d018c69288584bde /libs/androidfw/ApkAssets.cpp | |
| parent | 4e8973e9a881d13246a70631e4f5763f60f37dc3 (diff) | |
| parent | 833603caabb1a850a63a970fc285b4c8ed7401f8 (diff) | |
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459
* changes:
Remove VPN info arrays from NetworkStats(Observer|Recorder)
NetworkStatsFactory: Take VPNs into account for network/battery stats
Remove duplicate line in clat_simple test file
Remove unused lastStats parameter
Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
0 files changed, 0 insertions, 0 deletions