| commit | f7a8a679f8d1d89012e83001e00dae6571929bf7 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 07 18:57:38 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 07 18:57:38 2017 +0000 |
| tree | df2b7291758b562389ae8bc7301eaa37b4cb5776 | |
| parent | 34c9a6a2ef165bd218d8426c88b9b0f2d6741eaa [diff] | |
| parent | 4e780891d411d6f160250982d1de73d215b57538 [diff] |
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours am: 054a3b98cb -s ours am: 8a8d41cb6e -s ours am: 1c3be623ba -s ours" into oc-mr1-dev-plus-aosp