Merge "Remove superfluous conditional on 'shortcut'"
authorGabriel Marin <gmx@chromium.org>
Thu, 29 Dec 2016 06:03:43 +0000 (06:03 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 29 Dec 2016 06:03:43 +0000 (06:03 +0000)

Trivial merge