ref: c1913c9cf4a1f5a417349ad59dc81ca8397fd456
parent: 132ef4295a40f9159205e9253c18fff9130f69eb
parent: 54a03e20ddffd1fd9abf960daa74572cf173a5c8
author: James Zern <jzern@google.com>
date: Mon Sep 9 10:38:01 EDT 2013
Merge "Revert "New mode_info_context storage""