tree 13187f2946f9a2b4db85ca64285d45da6f6b93e8
parent 8a8d41cb6ee2d04e333d48fceaed8fb810d8ebf5
parent 384309dea01ff06c875cde81173f0c6aeb8e871b
author Sudheer Shanka <sudheersai@google.com> 1504809825 +0000
committer android-build-merger <android-build-merger@google.com> 1504809825 +0000

Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2  -s ours
am: 384309dea0  -s ours

Change-Id: I550af6b29aef745ff10c7592de7f468b6a8859ff