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

Skip to content
Commit 604dc8cf authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Return the activity type of any child activity in the Task" into tm-dev... 

Merge "Return the activity type of any child activity in the Task" into tm-dev am: 2b8d1c35 am: d965aa41

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



Change-Id: Ieccd552ab91f1d9dec8ae02ad071af9fc6d878f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8115df81 d965aa41
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment