Skip to content
Commit 3ea014d0 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Apply pending-intent op before blanket locktask check" into udc-dev am:... 

Merge "Apply pending-intent op before blanket locktask check" into udc-dev am: 0e875249 am: e901bc15

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



Change-Id: I8efbccc780770217366b31ab452426aa25e24571
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21e41eee e901bc15
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