)]}' { "commit": "d7693c4c8e0825927fe5d76133fed96b43e60afb", "tree": "a8d5e6cdcecda5b508a4388dc2713770b20117a4", "parents": [ "6b1ff61f62db82adf8e47c121cd13c29831ad21b", "76445f3aef388aac78369c2107ea61a1638dfa91" ], "author": { "name": "Doug Zongker", "email": "dougz@android.com", "time": "Wed Sep 15 17:03:51 2010 -0700" }, "committer": { "name": "Doug Zongker", "email": "dougz@android.com", "time": "Wed Sep 15 17:03:51 2010 -0700" }, "message": "resolved conflicts for merge of 76445f3a to master\n\nChange-Id: I658894dcaddbf0de428e3c51dbcdc306d3f47a52\n", "tree_diff": [] }