Skip to content
Commit 6694db51 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add BroadcastOptions.setDeferUntilActive() API."... 

[automerger skipped] Merge "Add BroadcastOptions.setDeferUntilActive() API." am: 0c67ec28 am: 2c011ab8 am: a289cb84 -s ours

am skip reason: Merged-In I9a356c8701d73f5687831fbe5b699e4485f07dd5 with SHA-1 3bb8afe6 is already in history

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



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