tree fea036c163d2203fda4f52a6509adf5652eb6a39
parent 1505fe6152717301ad7e4e3797af8da342d406c1
parent 08ef7ddaff6e171dbefb002b963648a33a783447
author Treehugger Robot <treehugger-gerrit@google.com> 1614761464 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614761464 +0000

Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14924edf870ff55c334113f5d1583862be20e0f8