Merge "Make butterfly_self() signature consistent with butterfly()"
authorYi Luo <luoyi@google.com>
Tue, 21 Mar 2017 22:32:20 +0000 (22:32 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 21 Mar 2017 22:32:20 +0000 (22:32 +0000)

Trivial merge