commit | 384309dea01ff06c875cde81173f0c6aeb8e871b | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:35:44 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:35:44 2017 +0000 |
tree | 2152db4003ebcea0b869f824c57046a9d7958a46 | |
parent | 054a3b98cb078aa3d6bb2fe551f41e503c850b22 [diff] | |
parent | be2d3c287138b087f515328db1ff801b1b55e2ae [diff] |
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 Change-Id: Id8af45c896241c03d9ca43f9cd5825e77ffe6563