commit | 2cdc59452af3a1a0be85a9cf65bb91154e7c225d | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 18:50:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 18:50:12 2017 +0000 |
tree | b3dc761922bf5a04a9e793f47f9aa0554f19aebc | |
parent | adcf5350c0bd2a3eedcca663b1ebd3775c188c6a [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: I40def87cb269e58132b5da63ca05a5c0a63193cc