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

Commit 9042e89f 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: d985c09b

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



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