ref: cc1aac1b3cca2a4e388ba9c6d814a472eab33bca
parent: 585190474411493efa279339e74153d2ffa9474f
parent: 5efd9609e30eb4220d100a8f32991f8e8b7b63a3
author: John Koleszar <jkoleszar@google.com>
date: Tue Jul 16 07:23:38 EDT 2013
Merge "Fix above context pointers"