tree b3dc761922bf5a04a9e793f47f9aa0554f19aebc
parent 2cdc59452af3a1a0be85a9cf65bb91154e7c225d
parent 1608a09e47f2d722021b573951556b5fd29b3d1a
author Sudheer Shanka <sudheersai@google.com> 1504810603 +0000
committer android-build-merger <android-build-merger@google.com> 1504810603 +0000

Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085  -s ours am: 8ca874ff80  -s ours
am: 1608a09e47  -s ours

Change-Id: I6e1d29ace3c4854fcfebedaa9651ed1bec477aec