commit | e0ebf2197b892af25164ef9862033fc0aa542944 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:50:19 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:50:19 2017 +0000 |
tree | df2b7291758b562389ae8bc7301eaa37b4cb5776 | |
parent | 1c3be623bac933ec1e1ad115d8e00ef81ed28cd3 [diff] | |
parent | ad5a21d2474e61f2069f7a5f537b13930c39fa48 [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 Change-Id: I1ea827dcfad6cc5d54824195c7aff42da65d43a1