)]}'
{
  "commit": "5d94fb7040c710af38119eebb60e0ecae122d650",
  "tree": "f569ce93b71d4a3a9a367d5475930b82556e8031",
  "parents": [
    "d48474969e786eaf911ac51bcd05faa3399b788a"
  ],
  "author": {
    "name": "Adam Lesinski",
    "email": "adamlesinski@google.com",
    "time": "Wed Aug 30 16:12:05 2017 -0700"
  },
  "committer": {
    "name": "Adam Lesinski",
    "email": "adamlesinski@google.com",
    "time": "Wed Aug 30 16:12:05 2017 -0700"
  },
  "message": "AAPT2: Fix issue with resource deduping\n\nResource deduping relies on the definitions of\nConfigDescription.ConflictsWith, ConfigDescription.IsCompatibleWith,\nand ConfigDescription.Dominates.\n\nConflictsWith is supposed to ignore range-based qualifiers, like\nversion, density, smallest width, screen size, etc.\n\nThis was not the case for screen size, and was assumed that the\nchoice of screen size is mutually exclusive.\n\nThis CL fixes the assumption and includes screen size (small, normal, large, xlarge)\nas a qualifier that does not conflict.\n\nBug: 64397629\nTest: make aapt2_tests\nChange-Id: I573a6735fedd7721a10ba32902bc5d27ef99b88e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "6a099651f2ce57d939e49573ea568465ce4e8f4a",
      "old_mode": 33188,
      "old_path": "tools/aapt2/ConfigDescription.cpp",
      "new_id": "a9278c136cff6b1315273c0c7e26cbf2ab10dafb",
      "new_mode": 33188,
      "new_path": "tools/aapt2/ConfigDescription.cpp"
    },
    {
      "type": "modify",
      "old_id": "14a565624e012b6e58cbac97c6482efbe5c50763",
      "old_mode": 33188,
      "old_path": "tools/aapt2/ConfigDescription_test.cpp",
      "new_id": "1f351bf7481d944124f2378bb2cb211697287f77",
      "new_mode": 33188,
      "new_path": "tools/aapt2/ConfigDescription_test.cpp"
    }
  ]
}