Skip to content
Commit 58e4f9ee authored by John Wu's avatar John Wu Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Do not resolve ActivityInfo in navigateUpTo" into... 

[automerger skipped] Merge "Do not resolve ActivityInfo in navigateUpTo" into tm-qpr-dev am: 576b93c7 am: 20e6f6e5 -s ours

am skip reason: Merged-In I9aa3e27f753f2f809e74a8f421f8b68e4d610702 with SHA-1 e3f0ca01 is already in history

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



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