)]}'
{
  "commit": "0367f32ea87e1b224768ca995000709fbf14e7eb",
  "tree": "acb4dfeba6df34d7ff9aa5af2bfe9854eb1f9b46",
  "parents": [
    "387a10e3dcae530c83af31be95e8aef5064b0f5b",
    "a0900fd0db5408da029fd3c71ec1f9d49ff98b3f"
  ],
  "author": {
    "name": "Yaowu Xu",
    "email": "yaowu@google.com",
    "time": "Mon Jan 11 10:27:35 2016 -0800"
  },
  "committer": {
    "name": "Debargha Mukherjee",
    "email": "debargha@google.com",
    "time": "Wed Jan 13 13:18:06 2016 -0800"
  },
  "message": "Merge branch \u0027master\u0027 into nextgenv2\n\nManually resovled the following conflicts:\n\tvp10/common/blockd.h\n\tvp10/common/entropy.h\n\tvp10/common/entropymode.c\n\tvp10/common/entropymode.h\n\tvp10/common/enums.h\n\tvp10/common/thread_common.c\n\tvp10/decoder/decodeframe.c\n\tvp10/decoder/decodemv.c\n\tvp10/encoder/bitstream.c\n\tvp10/encoder/encodeframe.c\n\tvp10/encoder/rd.c\n\tvp10/encoder/rdopt.c\n\nChange-Id: I15d20ce5292b70f0c2b4ba55c1f1318181481596\n",
  "tree_diff": []
}
