commit | 054a3b98cb078aa3d6bb2fe551f41e503c850b22 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:23:09 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:23:09 2017 +0000 |
tree | 2152db4003ebcea0b869f824c57046a9d7958a46 | |
parent | d4c2d2aca3ca1f38a4117b7cfd8c571bce892513 [diff] | |
parent | b411a9d3c1a1ad8fa5aaf3b1b88926138f4b1fca [diff] |
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours Change-Id: Iaaaa496a0b092e48d7acf7901a40e9767efedba6