tree f33d21181b0922478d1dfb47c725f64650f5d1cd
parent 9d68259a27f4b06c951963ae9e6e7c4ae47b2e95
parent e0f68a48559176ccfa20f4a2eb9fd1e4eb44ac6b
author Junyu Lai <junyulai@google.com> 1606285945 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606285945 +0000

Merge "Expose getTx/RxBytes in TrafficStats" am: 6ef6648cd9 am: aca01cd0c1 am: e0f68a4855

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

Change-Id: I755eb6294da6cba787f60d057997a4d239aaa095