[automerger skipped] fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: b6662062ff am: 1e69127a39 -s ours
am skip reason: Change-Id Ib12ee88295eb502f6da13d212b4fd6298dea380f with SHA-1 b6662062ff is in history
Change-Id: I7d29d30d5ba68dd0cf3d8b10e229f7de7fec947a
This commit is contained in:
committed by
Automerger Merge Worker
commit
2b4284999f