| commit | 3333ae92fc087dc2525abca7173c6b2ccb9881d3 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 07 19:13:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 19:13:07 2017 +0000 |
| tree | bc42bec51666cf6eed830336e1ffaf11e69c1f6b | |
| parent | 8e613700a1d99a19f182b472a9923c1abe31f270 [diff] | |
| parent | 319693bce2c9825f26b3e7258aa106c70ac4b198 [diff] |
Merge "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" into oc-mr1-dev-plus-aosp am: 319693bce2 -s ours Change-Id: Ibffd02dd26824f355ec642216633c66f751e40f1