commit | b411a9d3c1a1ad8fa5aaf3b1b88926138f4b1fca | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:19:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:19:13 2017 +0000 |
tree | 8335b3b713bf1a35899f0dbaeeb699ae4329a92b | |
parent | 8bde47ae8215a7d3a69cbafe30aa9524388ce200 [diff] | |
parent | b5abc8f89bdff5e4c83e7c261c4ce36e86ab2947 [diff] |
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: I6e63b41e0a0c499aeeab069da4666c4f42a18fc9