ref: 8fc95a1b119b7e9e34ef989e3d5ced0e358bc2c4
parent: 9c9a3b277568a58c8fcefa2c4031590a39b08e49
parent: ac6093d179d8488f90bf10c6d0abcc48be327d28
author: Scott LaVarnway <slavarnway@google.com>
date: Fri Sep 13 04:56:20 EDT 2013
Merge "New mode_info_context storage -- undo revert"