tree 17dea9f91d6bc433d4bd49e2bfdb23fd6ff07f8a
parent 77c9dba0231328adc276bc5403eabc369ba0067e
parent c98d5a9d97614e8ba5fcc50b7a3b4c006741c328
author Aaron Huang <huangaaron@google.com> 1631254012 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631254012 +0000

[automerger skipped] Merge "NetworkStats: Avoid Division By 0" into sc-qpr1-dev am: c98d5a9d97 -s ours

am skip reason: Merged-In I4e5ac9da7adf707d7f991483555ab5c6d0cc3245 with SHA-1 aeaa9cf589 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15782831

Change-Id: I32041742d029c9ce5d91e5006978e7debd9375d9