commit | 459c05d27a7693168660a0bbffe51e35b86692f0 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 19:02:10 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 19:02:10 2017 +0000 |
tree | df2b7291758b562389ae8bc7301eaa37b4cb5776 | |
parent | f7a8a679f8d1d89012e83001e00dae6571929bf7 [diff] | |
parent | e0ebf2197b892af25164ef9862033fc0aa542944 [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 am: 384309dea0 -s ours am: ad5a21d247 -s ours am: e0ebf2197b -s ours Change-Id: I97e61c93c284641a3dd59e08dffc2c86e3b9261b