Merge "aq-mode=3: Don't reset segment if block is determined to be skin."
authorMarco Paniconi <marpan@google.com>
Tue, 22 Dec 2015 20:18:24 +0000 (20:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 22 Dec 2015 20:18:24 +0000 (20:18 +0000)

Trivial merge