)]}'
{
  "commit": "28830f292a06db0cc0d0eb554fd2373dd5af01e5",
  "tree": "47fdad04a24529abb760caedf827444f1d095e42",
  "parents": [
    "724976bd27bdfe7d64db47fa2dd1827e3e90ef68"
  ],
  "author": {
    "name": "Mark Punzalan",
    "email": "markpun@google.com",
    "time": "Mon Jun 22 15:21:44 2026 -0700"
  },
  "committer": {
    "name": "Android Build Coastguard Worker",
    "email": "android-build-coastguard-worker@google.com",
    "time": "Mon Jul 13 17:43:02 2026 -0700"
  },
  "message": "aapt2: Sanitize Javadoc comments to prevent code injection\n\nPrevent Javadoc breakout and arbitrary code injection in generated\nR.java.\n\nAAPT2 extracts XML comments and places them in Javadoc blocks in the\ngenerated R.java file. If these comments contain Javadoc terminators\n(*/) or Java Unicode escapes (e.g., \\u002f), they can break out of the\nJavadoc block and inject arbitrary executable Java code.\n\nBug: 524767048\nTest: atest aapt2_tests (added comprehensive sanitization tests)\nFlag: EXEMPT CVE_FIX\n\nCherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:863026ecf4f3469c0f6e45ad716ed133fbc30a77\n\nCherrypicked by Aesir\nCherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:5874a9196fefd485dcb5382198e51580a01e105a\nMerged-In: I6a566be2d3772bfbf86897f1ccf70bc8c7250e5f\nChange-Id: I6a566be2d3772bfbf86897f1ccf70bc8c7250e5f\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "35126ff7ed9419047ee50a67256436040f6003fb",
      "old_mode": 33188,
      "old_path": "tools/aapt2/java/AnnotationProcessor.cpp",
      "new_id": "ef85ba5f7320bf35024757dc7c798b966b1dfc1c",
      "new_mode": 33188,
      "new_path": "tools/aapt2/java/AnnotationProcessor.cpp"
    },
    {
      "type": "modify",
      "old_id": "6d6cc20896861668518376da9a499a4f6575e25d",
      "old_mode": 33188,
      "old_path": "tools/aapt2/java/AnnotationProcessor_test.cpp",
      "new_id": "c0c3c93bd629ad3037f0147f69d8bda23d529ca0",
      "new_mode": 33188,
      "new_path": "tools/aapt2/java/AnnotationProcessor_test.cpp"
    }
  ]
}