)]}'
{
  "commit": "3b85bcb96c299f472ba0f24d12f512dbf8b47218",
  "tree": "b976a1ed2d101a9df493cc5485443b6dd786a336",
  "parents": [
    "6efd1caf45d449b75e65bd6d29a164b3766938d8"
  ],
  "author": {
    "name": "Googler",
    "email": "noreply@google.com",
    "time": "Thu May 16 14:47:50 2019 -0700"
  },
  "committer": {
    "name": "Copybara-Service",
    "email": "copybara-worker@google.com",
    "time": "Thu May 16 14:48:54 2019 -0700"
  },
  "message": "Ignore resource conflicts which involve pseudo locales. These conflicts occur when an app has custom pseudo locales configured (presumably while on AAPT), then gets migrated to AAPT2 which generates these pseudo locales for free. Pseudo locale content is all gibberish, so we don\u0027t care about conflicts.\n\nRELNOTES: None.\nPiperOrigin-RevId: 248604319\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "bd8ff6ca8975fa44f32fce5ac6febf1024c2392b",
      "old_mode": 33188,
      "old_path": "src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java",
      "new_id": "d6f06c5d8c815476a02ffcb98a1174b7a658216a",
      "new_mode": 33188,
      "new_path": "src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java"
    },
    {
      "type": "modify",
      "old_id": "02f193c0f773dc0ac74110e48b58137cd69b68db",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/DataKey.java",
      "new_id": "f08dab7cb9729b4ab2e30f76ee0bb182c73c87ed",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/DataKey.java"
    },
    {
      "type": "modify",
      "old_id": "e29361ab74ad9a19482c967de5105f226acf265b",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java",
      "new_id": "34a52f25fc5e5f2175ce04fd8ff546df9ca7cd8b",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java"
    },
    {
      "type": "modify",
      "old_id": "d1077f0e8c5e412dc626762b0b279c98568d00b4",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/MergeConflict.java",
      "new_id": "763aea17157eb811a97afd950a30657488453169",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/MergeConflict.java"
    },
    {
      "type": "modify",
      "old_id": "1801026c96095bba14ae8cc59b7aeaf0d178af17",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/RelativeAssetPath.java",
      "new_id": "23e884311eec1cc772ae779befb37681102278e6",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/RelativeAssetPath.java"
    }
  ]
}
