commit | d7a5dd9cc42887b8612ad262d0ee41c491205358 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Thu Aug 23 12:34:41 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 23 12:34:41 2012 -0700 |
tree | 39fcbe6db6f065101074c98da8970a83d4df0d4b | |
parent | 41d6c769f5fa21da3cbc116af95d88949a4a5c76 [diff] | |
parent | 7c220b78ca620110965fb77ea3d91c1ea12cb487 [diff] |
am 7c220b78: (-s ours) am 10bbadf3: (-s ours) am 1a1b0f9e: (-s ours) Merge "DO NOT MERGE - Plumb context through for serialization." * commit '7c220b78ca620110965fb77ea3d91c1ea12cb487': DO NOT MERGE - Plumb context through for serialization.