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

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

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

Change-Id: I48f72b8251dc8c9bb873cb34728e9f7a633a56cb
This commit is contained in:
Mark Chien
2020-10-28 13:33:06 +00:00
committed by Automerger Merge Worker

Diff Content Not Available