tree 1b64298f642bb4a02db5772e9304391fc5a9186c
parent 72f3ad8f09ba073882f2005aeb70b2436a253cc5
author Jason Sams <jsams@google.com> 1343178620 -0700
committer Stephen Hines <srhines@google.com> 1345252996 -0700

DO NOT MERGE - Plumb context through for serialization.

Change-Id: I2a49f57aa7576604deeac898a7cceb36ae68d66f