tree b96baa24425eeba2fdba897589630c38625b1dd4
parent 49b4b72b7a0999a9b6b8dab6504fe52e717c2fb0
parent edec8087871c76049f2ae1a627beb317de9b700d
author Alex Converse <aconverse@google.com> 1392338372 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> 1392338372 -0800

Merge "Disable using golden frame modes if golden frames are not being used"