commit | 1c3be623bac933ec1e1ad115d8e00ef81ed28cd3 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:41:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:41:58 2017 +0000 |
tree | df2b7291758b562389ae8bc7301eaa37b4cb5776 | |
parent | 46ec0e97b483b17e5f39f25f5e4aafdca831c099 [diff] | |
parent | 8a8d41cb6ee2d04e333d48fceaed8fb810d8ebf5 [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 am: 054a3b98cb -s ours am: 8a8d41cb6e -s ours Change-Id: Ic5b7d64f16007fd4c1addb50abf4ff3feaae9a56