Merge "Make reset_frame_context an enum."
authorRonald S. Bultje <rsbultje@gmail.com>
Fri, 11 Sep 2015 22:36:49 +0000 (22:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 11 Sep 2015 22:36:49 +0000 (22:36 +0000)

Trivial merge