tree 3069afaa036ef349961485fc92d46b57f92edb62
parent 2a98e05f9a8bd9820c87f525e556b15d42ab7a4b
parent d583f34df1b18903609dcfb96dd3351e23e3d57c
author Paul Hu <paulhu@google.com> 1597025080 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597025080 +0000

Merge "Verify pending intent flags" am: f623c1e2c2 am: d583f34df1

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

Change-Id: Id37713388c0c2245e708ca1ca81e78d288168dfd