commit | 8e36cb961771c693d49d2fce918e536505ffb81a | [log] [tgz] |
---|---|---|
author | Frank Li <lifr@google.com> | Wed Mar 02 09:14:20 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 02 09:14:20 2022 +0000 |
tree | 6944f0eef6c293a8ac8a77b395838c3cb14b6c47 | |
parent | ad4f75857246476b0beaac39c9dd3fb68ef80c63 [diff] | |
parent | b5bbf7fe8488d682777a4a8a24c5da1321a99cc9 [diff] |
[automerger skipped] Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 am: 35278e3a9e am: b5bbf7fe84 -s ours am skip reason: Merged-In I022c34b5af87fe3ff6857ea264bac2f7098eaed4 with SHA-1 ba76d15b9d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004530 Change-Id: Ic53c362943a8dfd8fb107d953f2dae9a14b2b5f6