commit | 34c9a6a2ef165bd218d8426c88b9b0f2d6741eaa | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:54:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:54:46 2017 +0000 |
tree | df2b7291758b562389ae8bc7301eaa37b4cb5776 | |
parent | 2da1dde301ac975619b1f73dcf58dd5728eb4505 [diff] | |
parent | 2cdc59452af3a1a0be85a9cf65bb91154e7c225d [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: 2cdc59452a -s ours Change-Id: I13a2816e787167e1dbb5b46ecb297552bb72984f