)]}' { "commit": "19b3e610c86fcadb837d252c794cb5e8008826ae", "tree": "b5382f0f65cf48e98eec618c94f67e4ff17764b5", "parents": [ "dc7812ea479304c309456c08c0f50e26d0e83f6c", "bf1b5bfcaf60206821a4f450c17e70b143b1a74c" ], "author": { "name": "Nam T. Nguyen", "email": "namnguyen@chromium.org", "time": "Wed Jul 23 16:12:25 2014 -0700" }, "committer": { "name": "Nam T. Nguyen", "email": "namnguyen@chromium.org", "time": "Wed Jul 23 16:12:25 2014 -0700" }, "message": "Merge remote-tracking branch \u0027upstream/master\u0027 into bbb\n\nConflicts:\n\telftools/elf/dynamic.py\n\nResolved by using upstream\u0027s verbatim copy because vapier\u0027s change is\nnow in upstream.\n\nChange-Id: I6c597d4ef0a876d26736f96360cff95c072e8005\n", "tree_diff": [] }