)]}'
{
  "commit": "4aae62ee774667852246dc21aa356de026537e40",
  "tree": "21b60931cf0dd9b3b52ac03bba2dcb587b2b2f97",
  "parents": [
    "d61f2efdbb6760e8ac377d95a84e52be8e279a04"
  ],
  "author": {
    "name": "Dennis Song",
    "email": "denniscy@google.com",
    "time": "Mon Oct 02 04:31:34 2023 +0000"
  },
  "committer": {
    "name": "Dennis Song",
    "email": "denniscy@google.com",
    "time": "Wed Oct 04 06:45:15 2023 +0000"
  },
  "message": "Resolve conflict AVB rollback index location\n\nAdd an `--avb-resolve-rollback-index-location-conflict`\noption in merge_target_files. When this option is set,\nthe merge tool will resolve conflicting index locations\nby assigning the smallest unused index location.\n\nThis is to support merging system and vendor target files\nfrom two different targets. In this case, the two target\nfiles may have conflict rollback index location because\nthey were built independently.\n\nTest: atest releasetools_test\nTest: validate_target_files *-target_files-*.zip\nTest: merge_target_files \u0026\u0026\n        add_img_to_target_files \u0026\u0026\n        img_from_target_files \u0026\u0026\n        flash device\nBug: 300604688\nChange-Id: Ibd18ef2a9f3784157fe17966f5364c3c81c9bd9f\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "31f8736e4657f6f6a4a63476b42207e6f21617d1",
      "old_mode": 33188,
      "old_path": "tools/releasetools/add_img_to_target_files.py",
      "new_id": "fc4ab68fc3f88e53986ea353b0ddda9c8f9c95ad",
      "new_mode": 33188,
      "new_path": "tools/releasetools/add_img_to_target_files.py"
    },
    {
      "type": "modify",
      "old_id": "c5a3fe777ffa8b78ae5ef29a5c2321e1e4ef3c67",
      "old_mode": 33188,
      "old_path": "tools/releasetools/common.py",
      "new_id": "f9a471a5982bd31b79bf8cc16b3b78d29a93b4d9",
      "new_mode": 33188,
      "new_path": "tools/releasetools/common.py"
    },
    {
      "type": "modify",
      "old_id": "a0d3a1c67a339ee2ad501dbd960bd5d766f7f305",
      "old_mode": 33261,
      "old_path": "tools/releasetools/merge/merge_target_files.py",
      "new_id": "6bf1b4903183ed7b1f158f318e51778533ea2317",
      "new_mode": 33261,
      "new_path": "tools/releasetools/merge/merge_target_files.py"
    },
    {
      "type": "modify",
      "old_id": "2bd4f36bd9fd6eceff8e3547961e8c20f10f2cd0",
      "old_mode": 33188,
      "old_path": "tools/releasetools/test_common.py",
      "new_id": "14f0e88f91b507c1252e6d8043ba15ee4a943b52",
      "new_mode": 33188,
      "new_path": "tools/releasetools/test_common.py"
    },
    {
      "type": "modify",
      "old_id": "beb9e75dfdf66f598c30b2913eaef441da33fe61",
      "old_mode": 33261,
      "old_path": "tools/releasetools/validate_target_files.py",
      "new_id": "82b31076f7aa1d49022fa92198ad166c0e89071c",
      "new_mode": 33261,
      "new_path": "tools/releasetools/validate_target_files.py"
    }
  ]
}