tree dd669a74fd87779b31b4d6f58eea0546544d5517
parent be2d3c287138b087f515328db1ff801b1b55e2ae
parent 7cbb2f758742750634f67371f2ea7a93c90df613
author Sudheer Shanka <sudheersai@google.com> 1504808980 +0000
committer android-build-merger <android-build-merger@google.com> 1504808980 +0000

Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48
am: 7cbb2f7587

Change-Id: Idc1174d25aecef3bb5461d22a6d2bcf3fdf6bed3