tree 8cf3dadb6e9e826c0cd616dfc7bbdb8db920bb06
parent ad86c0342e7a39386efbeec522ba56f3e3bec997
parent b5abc8f89bdff5e4c83e7c261c4ce36e86ab2947
author Sudheer Shanka <sudheersai@google.com> 1504807825 +0000
committer android-build-merger <android-build-merger@google.com> 1504807825 +0000

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

Change-Id: If849eb710ccd66922a8d59d60c8b4e39850f9935