)]}'
{
  "commit": "9d5ad9d6af0d0e71127a7acff87b004552d3e2cb",
  "tree": "041116e2049ebae36b63e7959a42c555585c77e0",
  "parents": [
    "a7cc5a3bb11f9c416b9d957c686341b51625baf1"
  ],
  "author": {
    "name": "Hamsalekha S",
    "email": "hamsalekha.s@ittiam.com",
    "time": "Thu May 11 11:36:05 2017 -0700"
  },
  "committer": {
    "name": "android-build-team Robot",
    "email": "android-build-team-robot@google.com",
    "time": "Thu Jun 29 21:58:04 2017 +0000"
  },
  "message": "DO NOT MERGE Fixed bug during resolution change\nfix merge conflict into mnc-mr2-release\nModifies how i4_header_decoded is decoder context is used, to ensure\nthat resolution change is detected even if PPS has not been decoded.\n\nThis retrofits parts of the below mentioned \u0027merged-in\u0027 commits\nwhich solve this for mnc-dr and later versions of the library. The retrofit\nrequired dropping portions that affected code introduced in a later baseline.\n\nBug: 35583675\nTest: provided input file no longer hangs\nChange-Id: I8fa30543759c5762b18e2380513e2ce616c858ef\nMerged-In: I0d248212aaf6635f34a70ad36657416a0c623d32\nMerged-In: Ifd21ebe1827d6d0c13018983c46c4301c2bb1669\n(cherry picked from commit 6622c88850f72ffd6b89c74bb3cdaa845a2837db)\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "ba32225bd6bf9449c34d849875facc50a21a544e",
      "old_mode": 33188,
      "old_path": "decoder/ih264d_parse_headers.c",
      "new_id": "5842f3fe434a43e5507543a39c5dbc6e06a08d04",
      "new_mode": 33188,
      "new_path": "decoder/ih264d_parse_headers.c"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "2c1dd02d8429494b3c04bad3770c16fdea13f871",
      "new_mode": 33188,
      "new_path": "decoder/ih264d_parse_headers.c~"
    }
  ]
}