tree 1b64298f642bb4a02db5772e9304391fc5a9186c
parent 72f3ad8f09ba073882f2005aeb70b2436a253cc5
parent 43e319386de1de0d72050b62ab37d0209bda1230
author Stephen Hines <srhines@google.com> 1345669571 -0700
committer android code review <noreply-gerritcodereview@google.com> 1345669571 -0700

Merge "DO NOT MERGE - Plumb context through for serialization."