commit | 1a8817eb8f198f969b4ecbae9cd6001ad59592fe | [log] [tgz] |
---|---|---|
author | Lenka Trochtova <ltrochtova@google.com> | Sun Apr 17 06:04:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 17 06:04:31 2016 +0000 |
tree | a06ed026acce432df0bd62efcfa791f3e4680054 | |
parent | 60e0b71d2dfb82ef873a2d862a65b6155cd52f68 [diff] | |
parent | 0fdea94a8310864146ff08eddcf094c66c7a19b3 [diff] |
Merge "DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout." into marshmallow-cts-dev am: 0fdea94 -s ours * commit '0fdea94a8310864146ff08eddcf094c66c7a19b3': DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout. Change-Id: I434f357498548057901ca933883590eba69834b6