[automerger skipped] fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: eddd5871ed am: 536b889f7b -s ours am: 1ab6890e12 -s ours
am skip reason: Change-Id Ib12ee88295eb502f6da13d212b4fd6298dea380f with SHA-1 eddd5871ed is in history
Change-Id: If3d27f37ec8acd5d31c0235563b09aba2b5168a5
This commit is contained in:
committed by
Automerger Merge Worker
commit
689ea76adf