Merge "Fix lingering x->skip settings if static_threshold is used." into experimental
authorRonald S. Bultje <rbultje@google.com>
Mon, 15 Apr 2013 21:20:47 +0000 (14:20 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 15 Apr 2013 21:20:47 +0000 (14:20 -0700)

Trivial merge