)]}' { "commit": "2ad06909c97d0ae17f2620bc6e2dbbbe36415bd5", "tree": "8b14aee046ff02fb48e7d3efcf2b18ce6d55ddfe", "parents": [ "bf8d7210c4bbbdc875e9695a301cdf9c3b544279", "bcf5e2388e608e4ec4372d1eeb918bbe0e095b2e" ], "author": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Thu Jan 03 11:00:44 2019 -0800" }, "committer": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Fri Jan 04 19:53:40 2019 +0000" }, "message": "DO NOT MERGE ANYWHERE resolve merge conflicts of bcf5e2388e608e4ec4372d1eeb918bbe0e095b2e to oc-dr1-dev\n\nBug: 115739809\nBug: 120630087\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: If09327be8a4b4c35efe580d99d441d9320cbe2e9\n", "tree_diff": [] }