tree da51d7634ac5283e38dc6bfa900aba1be890047d
parent 0b6c6a09c9cb36f8b07a06e0b351e3375ab4150b
parent cdb9503af4802787fca70203ab9d4d14aee38c70
author Benedict Wong <benedictwong@google.com> 1625253144 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625253144 +0000

Merge "Add support for app data accounting for in-kernel dataplanes" am: 69e2f04207 am: cdb9503af4

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

Change-Id: I583a872bcb18f1b749f4ab0b49cbc9323920f048