commit | 905009ecc315f242379a1a90fdf25e1784a76d78 | [log] [tgz] |
---|---|---|
author | Lenka Trochtova <ltrochtova@google.com> | Sun Apr 17 06:13:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 17 06:13:12 2016 +0000 |
tree | 949dfede5c2dce71b290ef95fda77cf941cd85ab | |
parent | 3df540fec182454f9edeb54ab2b2ab4ef52adc56 [diff] | |
parent | ca57588ebcd634aeb481b291b0c10f48ec9133c7 [diff] |
Merge "DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout." into marshmallow-cts-dev am: 0fdea94 -s ours am: 1a8817e am: ca57588 * commit 'ca57588ebcd634aeb481b291b0c10f48ec9133c7': DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout. Change-Id: I1a5a7918f22299f959299ff1f8fd25ec9086534a