tree 7743b7fba41e5ff0b8f4f0b57197a3f1a48f8763
parent 88c95182c9bd80a3352e7a0f8a7912694b9f0e0a
parent 60486bba1deb20cdc9df5b1d03ea72cbd0364b99
author Natasha Lee <natashalee@google.com> 1604369769 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604369769 +0000

[automerger skipped] Merge "Allow the network stack to read network stats history" into rvc-qpr-dev am: ef3ed74b7a am: 60486bba1d -s ours

am skip reason: Change-Id Ibb6342b0f263c874bb1f7ab4031a639778bad37e with SHA-1 9ebadfcf7c is in history

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

Change-Id: I40c947f523733adb7f97325f48c3062008b64d28