Skip to content
Commit 2b2e7797 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Correct PendingIntent#getActivity() flags" into... 

[automerger skipped] Merge "Correct PendingIntent#getActivity() flags" into mainline-prod am: 522e0728 -s ours

am skip reason: Change-Id I4c3af75c87b797bcde9356a94c835c7422dac1c6 with SHA-1 cb292372 is in history

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

Change-Id: I48f72b8251dc8c9bb873cb34728e9f7a633a56cb
parents dc3897e9 522e0728
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