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

Commit d553be12 authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am:... 

Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am: 06258e35 am: dfda3dad am: fc5fde5d am: b35ea011

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



Change-Id: Ibcb41d5992104d2533d99b7d42fcbf874e9e537d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e451a922 b35ea011
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