)]}'
{
  "commit": "5a27b3bb85acaa80c2ca8526299638c2082836fb",
  "tree": "82e6430dd2fa6a094a65cf7a0d60ab10399228f2",
  "parents": [
    "4ac2ae3a4d593ae3128ab03daf1faff81e111159"
  ],
  "author": {
    "name": "Yaowu Xu",
    "email": "yaowu@google.com",
    "time": "Thu Oct 22 12:18:52 2015 -0700"
  },
  "committer": {
    "name": "Yaowu Xu",
    "email": "yaowu@google.com",
    "time": "Thu Oct 22 18:25:41 2015 -0700"
  },
  "message": "Fix merge defects\n\nThis commit fixes the merge conflicts between master and nextgenv2 and\ndisable early termination in choose_tx_size() to avoid failure in test.\n\nThe test failures are pre-existing, some of the issue were fixed in\nmasterbase already, so will have another merge to introduce the fixes.\n\nChange-Id: Ib71889661955e73aedbb4db49d8be70425281dcb\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "5c0ed959ea4110e325671515c211a453c97dbc32",
      "old_mode": 33261,
      "old_path": "configure",
      "new_id": "54816560e458ccb231be9c50b0078c1978e61adb",
      "new_mode": 33261,
      "new_path": "configure"
    },
    {
      "type": "modify",
      "old_id": "57c4321c136bbea4cf1d47cbfd63e60ed4b858f4",
      "old_mode": 33188,
      "old_path": "vp10/common/blockd.h",
      "new_id": "392b5d233fddf33a3928b7e5b4f94d9e48607a0f",
      "new_mode": 33188,
      "new_path": "vp10/common/blockd.h"
    },
    {
      "type": "modify",
      "old_id": "d8874c5a9f1f55cbe6b49bf6a63f4c2cac42a34b",
      "old_mode": 33188,
      "old_path": "vp10/common/entropymode.c",
      "new_id": "e2cecbfdd80ac27bb86b6a0141671e8ad70105d0",
      "new_mode": 33188,
      "new_path": "vp10/common/entropymode.c"
    },
    {
      "type": "modify",
      "old_id": "aa62042263914e93d8e35d4ccd0c3539926d9f2a",
      "old_mode": 33188,
      "old_path": "vp10/common/onyxc_int.h",
      "new_id": "681413377845485443bc767087852a4ec96fb70b",
      "new_mode": 33188,
      "new_path": "vp10/common/onyxc_int.h"
    },
    {
      "type": "modify",
      "old_id": "d37b5e80230ede2b42b120fc06633e80c6938732",
      "old_mode": 33188,
      "old_path": "vp10/encoder/encodemb.c",
      "new_id": "5f0bc49d5d6d0165de8681f3a16f00a3008e3523",
      "new_mode": 33188,
      "new_path": "vp10/encoder/encodemb.c"
    },
    {
      "type": "modify",
      "old_id": "525e0345a7275da047afa3bea510012796dffec6",
      "old_mode": 33188,
      "old_path": "vp10/encoder/rdopt.c",
      "new_id": "d0b2f6b1a875abbc4c42558312935fb58d27b2e9",
      "new_mode": 33188,
      "new_path": "vp10/encoder/rdopt.c"
    }
  ]
}