Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d0052b authored by Yuri Ufimtsev's avatar Yuri Ufimtsev Committed by Automerger Merge Worker
Browse files

Merge "Provide a valid ComponentName for testing Parental Controls" into... 

Merge "Provide a valid ComponentName for testing Parental Controls" into tm-dev am: b27e2119 am: fd79cd39

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



Change-Id: I044c0895ef0f263e5e76a768192aa800ccddcb82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5498d438 fd79cd39
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment