)]}'
{
  "commit": "e1a4a812971f604d51bdf098b6117d9ba03da1c8",
  "tree": "d53b64a6f80fb82cfa43d65c9b3f2f73b9084cdf",
  "parents": [
    "6105e2415faa0f36ec6ae3399d90e1a173ef7f58"
  ],
  "author": {
    "name": "Andrew Pellegrini",
    "email": "apell@google.com",
    "time": "Wed Jun 22 20:46:21 2016 +0000"
  },
  "committer": {
    "name": "Lukacs Berki",
    "email": "lberki@google.com",
    "time": "Thu Jun 23 11:10:23 2016 +0000"
  },
  "message": "Adds the Android manifest merger as an option for android_binary rules. The merger that is used (legacy or android) is controlled by the manifest_merger attribute on android_binary and the default is controlled by the --android_manifest_merger flag.\n\nRELNOTES: The Android manifest merger is now available as an option for android_binary rules. The merger will honor tools annotations in AndroidManifest.xml and will perform placeholder substitutions using the values specified in android_binary.manifest_values. The merger may be selected by setting the manifest_merger attribute on android_binary.\n\n--\nMOS_MIGRATED_REVID\u003d125603954\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "500c60165d28376411a735e8051f24071e3c6294",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java",
      "new_id": "c9530a6c691b2511d507d43b5db73892c0e5bf54",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java"
    },
    {
      "type": "modify",
      "old_id": "a558b0566401e73b26d5e8890031f3c268e89a84",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java",
      "new_id": "e6e116d88825f8cfef95ab4550e606771d3ed3ef",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java"
    },
    {
      "type": "modify",
      "old_id": "cdc30bf39fbbc4822cceb708bbf41c0d36bf7554",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java",
      "new_id": "d8f7cbb7249a546c968dd82104b3fd69fd4bc1e1",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java"
    },
    {
      "type": "modify",
      "old_id": "863082555024222fcbf83cd6aff1cacc2e9be6cf",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java",
      "new_id": "964db8ae54638fc4e22da9bef1c82548b9e4e6ba",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java"
    },
    {
      "type": "modify",
      "old_id": "306a922bce06d9eb21d0717ea8ec0a4bfbf00d78",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java",
      "new_id": "0f2008b5698133bf930e443e36f28cecad9179ba",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java"
    },
    {
      "type": "modify",
      "old_id": "296f4aff1457eef4a707cd87e29501940c99f78b",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java",
      "new_id": "8992776ec26bc9e0a2ce9fe4f6edbca6cb56bc75",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java"
    },
    {
      "type": "modify",
      "old_id": "acd5cf1aa3c0a4e807705888a63393b51d140aad",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/LocalResourceContainer.java",
      "new_id": "971ccf7dfbcb9a5abf3d95a440520a4792ed69c8",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/LocalResourceContainer.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "21174401a0667bcb939cb391a57be0112329ecb5",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java"
    },
    {
      "type": "modify",
      "old_id": "2ac21a77ec1e2ed76582045a554ebc25eb722e37",
      "old_mode": 33188,
      "old_path": "src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java",
      "new_id": "6606fc23b8150ace4b1fc90ba4a8cf1ec32b3c4c",
      "new_mode": 33188,
      "new_path": "src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java"
    },
    {
      "type": "modify",
      "old_id": "69f58d6fbb9e05284d6d6e12f444d3e731ee785c",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java",
      "new_id": "9bbef3dd242a715f470235e9a41bff5939047d20",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java"
    },
    {
      "type": "modify",
      "old_id": "1d5da32118684ca48c2b03a1a75fa6917a466efb",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/BUILD.tools",
      "new_id": "d844ff955334882aea3acaa29ebf6c4bded870cb",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/BUILD.tools"
    },
    {
      "type": "modify",
      "old_id": "4a8f0a55008b58c4b82d7a9fd998bebc32d50238",
      "old_mode": 33188,
      "old_path": "src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java",
      "new_id": "ce1884d6a4734c8e56c71c447dc78f7a9b6b7bbe",
      "new_mode": 33188,
      "new_path": "src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java"
    },
    {
      "type": "modify",
      "old_id": "b6e7cb46db3d48ef5b8edd436a9a9230cd6a6942",
      "old_mode": 33188,
      "old_path": "tools/android/BUILD",
      "new_id": "1056ebc9353dfc27ff28baf028258ad8fd484977",
      "new_mode": 33188,
      "new_path": "tools/android/BUILD"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "755bf4cfe5acb4fe65b390919e590c198a1d039d",
      "new_mode": 33261,
      "new_path": "tools/android/manifest_merger.sh"
    }
  ]
}