)]}' { "log": [ { "commit": "fe1e8e6b4fe69a9b5de9b1acb2953ca4e2c1912d", "tree": "31a3869bba2d88cae2689dbf2eed6b3f20162d1e", "parents": [ "d793b1af4718dbdb16a0afb9a05521e164fbf3ee", "178319f5034b9292e0030896842718dce2a6a9f1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Dec 22 07:47:06 2024 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Dec 22 07:47:06 2024 -0800" }, "message": "Merge \"Empty merge ab/12770256 into aosp-main-future\" into aosp-main-future" }, { "commit": "178319f5034b9292e0030896842718dce2a6a9f1", "tree": "543b61a646afc4183c6c77bb6a3ccea1ef8049a0", "parents": [ "d726a99fa0d444abce5152e9add2e35c9b552d0f", "7b8dfef8e81c938662cc08b7544daa13ec6d8be4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:38 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:38 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: I00c1faee04cc20aa2ee1529a1ca972b811db79f6\nChange-Id: I426333444330ebc498f12cb1202a162ee4f64c4f\n" }, { "commit": "d793b1af4718dbdb16a0afb9a05521e164fbf3ee", "tree": "31a3869bba2d88cae2689dbf2eed6b3f20162d1e", "parents": [ "d726a99fa0d444abce5152e9add2e35c9b552d0f", "f9eda5e06cccae9c9031f92e592e327b5fc9c19a" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Dec 19 15:40:17 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 19 15:40:17 2024 -0800" }, "message": "Add janitors to the OWNERS file am: f9eda5e06c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/3421628\n\nChange-Id: Ibceb6babd50d1586eef89af2795eed504f45d744\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9eda5e06cccae9c9031f92e592e327b5fc9c19a", "tree": "31a3869bba2d88cae2689dbf2eed6b3f20162d1e", "parents": [ "c753f603a36b94a162a9b9f6bd7243bc1e969af0" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:18:45 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:18:45 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I2ca4e421407a1d510ba2a22dffe4ba376c3e5dc1\n" }, { "commit": "d726a99fa0d444abce5152e9add2e35c9b552d0f", "tree": "543b61a646afc4183c6c77bb6a3ccea1ef8049a0", "parents": [ "168bd9b47554021405773d3fc9306b7046c61529", "c753f603a36b94a162a9b9f6bd7243bc1e969af0" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Dec 13 11:55:05 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 11:55:05 2024 -0800" }, "message": "Add simple sharding support to jarjar am: c753f603a3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/3407866\n\nChange-Id: I0bf7ca1250d959643f14ebf5992d08425f926c07\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c753f603a36b94a162a9b9f6bd7243bc1e969af0", "tree": "543b61a646afc4183c6c77bb6a3ccea1ef8049a0", "parents": [ "168bd9b47554021405773d3fc9306b7046c61529" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Dec 06 13:44:18 2024 -0800" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Thu Dec 12 09:22:34 2024 -0800" }, "message": "Add simple sharding support to jarjar\n\n- The \"process\" subcommand now takes optional two\ninteger arguments. If they\u0027re set, jarjar will\nprocess only a subset of the input jar file which is determined\nby the arguments. For example, if you pass \"2 0\",\nthen jarjar will only process the first half of the input jar.\nUse \"2 1\" for processing the second half.\n\nWe then use merge_zips to combine the output jars.\n\n- Passing \"1 0\" will effectively disable the sharding behavior.\n\n- Other than that, we don\u0027t change any logic.\n\n- Because jarjar sorts the entries in the output file, the sharded\nversion may have entries in a different order. But that shouldn\u0027t matter\nbecause the input file has no duplicate entries, which we know\nbecause jarjar already has a duplicate entry check.\n\nTest: m framework-minus-apex framework-minus-apex_jarjar-sharded\n and make sure the javac output jars have the same entries.\n $ diff \\\n \u003c(jar tf $ANDROID_BUILD_TOP/out/soong/.intermediates/frameworks/base/framework-minus-apex/android_common/jarjar/framework.jar \\\n | sort) \\\n \u003c(jar tf $ANDROID_BUILD_TOP/out/soong/.intermediates/frameworks/base/framework-minus-apex_jarjar-sharded/android_common/jarjar/framework-minus-apex_jarjar-sharded.jar \\\n | sort)\n (no output)\n\nBug: 383559945\nFlag: EXEMPT New options are not used on production jars\nChange-Id: Ib32a5404ec36e9f145e9d4cb838ef48b9860006b\n" }, { "commit": "7b8dfef8e81c938662cc08b7544daa13ec6d8be4", "tree": "5d293fbfeaad2f361ecabfa18fe000fceebe9304", "parents": [ "f44694e4b57a2d16bc9207cd22b4e304a4657455", "168bd9b47554021405773d3fc9306b7046c61529" ], "author": { "name": "Rob Seymour", "email": "rseymour@google.com", "time": "Thu Sep 26 23:15:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 23:15:00 2024 +0000" }, "message": "Write data to buffered output stream. am: e110f69639 am: 168bd9b475\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/3282878\n\nChange-Id: Icfe98624b9b4562ebab46e3c977ffe9b8deaeb92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "168bd9b47554021405773d3fc9306b7046c61529", "tree": "5d293fbfeaad2f361ecabfa18fe000fceebe9304", "parents": [ "f44694e4b57a2d16bc9207cd22b4e304a4657455", "e110f69639b221a4f0ef89d177561b1be1d6ae98" ], "author": { "name": "Rob Seymour", "email": "rseymour@google.com", "time": "Thu Sep 26 22:58:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 22:58:41 2024 +0000" }, "message": "Write data to buffered output stream. am: e110f69639\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/3282878\n\nChange-Id: Ib6510fde70236669fb5b20ae170f12ef3c4d91df\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e110f69639b221a4f0ef89d177561b1be1d6ae98", "tree": "5d293fbfeaad2f361ecabfa18fe000fceebe9304", "parents": [ "f44694e4b57a2d16bc9207cd22b4e304a4657455" ], "author": { "name": "Rob Seymour", "email": "rseymour@google.com", "time": "Wed Sep 25 17:18:47 2024 +0000" }, "committer": { "name": "Rob Seymour", "email": "rseymour@google.com", "time": "Wed Sep 25 18:07:34 2024 +0000" }, "message": "Write data to buffered output stream.\n\nPrevent excessive system calls when generating jar files.\n\nExample: dagger2-bootstrap-compiler.jar\n before: 2,165,905 write syscalls\n after: 4,345 write syscalls\n\nBug: 369172440\nTest: m before and after checking hash of dagger2-bootstrap-compiler.jar\n\nChange-Id: I222597ba337d3b538237a62a4482542ae29182a1\nSigned-off-by: Rob Seymour \u003crseymour@google.com\u003e\n" }, { "commit": "f44694e4b57a2d16bc9207cd22b4e304a4657455", "tree": "d79fd260420ca7f26993cadb057551a2bdd75fcf", "parents": [ "a7ca2618590cb84c2f22f5a550434aae871b0222", "e68e94e93167fdeaf1092a42b9956ff370609c9b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 23:46:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 23:46:02 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: e68e94e931 -s ours\n\nam skip reason: Merged-In Ia06021992185f83de2b5145dc4da88338d7c0b29 with SHA-1 7b924baddf is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jarjar/+/27145140\n\nChange-Id: I00e0e305bc51ca4432bf7af3ca6891e84a483c43\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e68e94e93167fdeaf1092a42b9956ff370609c9b", "tree": "d79fd260420ca7f26993cadb057551a2bdd75fcf", "parents": [ "7b924baddfa25e2689efa6c7d0c5cc70f6446b0b", "a7ca2618590cb84c2f22f5a550434aae871b0222" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:49:52 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:49:52 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Ia06021992185f83de2b5145dc4da88338d7c0b29\nChange-Id: I813464828baed9f4c36548922f2e980ad3f991da\n" }, { "commit": "a7ca2618590cb84c2f22f5a550434aae871b0222", "tree": "d79fd260420ca7f26993cadb057551a2bdd75fcf", "parents": [ "f5d0558baf5576c66a387f003cbb321835e01fe4", "7b924baddfa25e2689efa6c7d0c5cc70f6446b0b" ], "author": { "name": "Zhi Dou", "email": "zhidou@google.com", "time": "Wed Feb 28 22:24:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 28 22:24:15 2024 +0000" }, "message": "skip if entry has been added am: a02a943a3b am: 7b924baddf\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2982311\n\nChange-Id: I08421259c7cdb546cb289b2681db754816de7d75\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7b924baddfa25e2689efa6c7d0c5cc70f6446b0b", "tree": "d79fd260420ca7f26993cadb057551a2bdd75fcf", "parents": [ "f5d0558baf5576c66a387f003cbb321835e01fe4", "a02a943a3bcb57a1aa7ec12cd5951ac139a595fb" ], "author": { "name": "Zhi Dou", "email": "zhidou@google.com", "time": "Wed Feb 28 21:43:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 28 21:43:06 2024 +0000" }, "message": "skip if entry has been added am: a02a943a3b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2982311\n\nChange-Id: Ia06021992185f83de2b5145dc4da88338d7c0b29\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a02a943a3bcb57a1aa7ec12cd5951ac139a595fb", "tree": "d79fd260420ca7f26993cadb057551a2bdd75fcf", "parents": [ "f3b6953e5350ff6e56a607e70dd13fd856473d8c" ], "author": { "name": "Zhi Dou", "email": "zhidou@google.com", "time": "Wed Feb 28 15:15:52 2024 +0000" }, "committer": { "name": "Zhi Dou", "email": "zhidou@google.com", "time": "Wed Feb 28 16:47:36 2024 +0000" }, "message": "skip if entry has been added\n\nBefore if an entry name exists, an error will be thrown. This change\nwill check whether the existing processed entry is the same entry as the\none currently processing. If they are the same, then the code will\ncontinue to process the next entry. Thus this entry will be only added\nonce. If they are not the same, then the original error will be thrown.\n\nTest: presbumit\nBug: 327404701\nChange-Id: I36c6f13c7899a28534de6d56bcbc8896a60cfd47\n" }, { "commit": "f5d0558baf5576c66a387f003cbb321835e01fe4", "tree": "80ca4df1f6c3f595362cc0d6625aef7c437efe9a", "parents": [ "534f2834b71c8b1d8c932655fcac9d3ab931a849", "6140b2d9a020b594d4d817b5106f68a70ced6d2f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jan 16 08:05:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 16 08:05:54 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: f3b6953e53 am: 7c35d9218e am: 6140b2d9a0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907692\n\nChange-Id: If637bc4e0e5b1a022ce42edcf222856ab48e9880\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6140b2d9a020b594d4d817b5106f68a70ced6d2f", "tree": "80ca4df1f6c3f595362cc0d6625aef7c437efe9a", "parents": [ "0f07eb51cc5eb6324866f5853dde16d0bad75acc", "7c35d9218e1444f54b48c8ad72768abf85a5ecee" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jan 16 07:33:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 16 07:33:30 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: f3b6953e53 am: 7c35d9218e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907692\n\nChange-Id: I6fe47424221604bbbb198e957bc9c5a414dd806f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7c35d9218e1444f54b48c8ad72768abf85a5ecee", "tree": "80ca4df1f6c3f595362cc0d6625aef7c437efe9a", "parents": [ "d9a2c2650dfb85a9f7033034a106e8773221d7aa", "f3b6953e5350ff6e56a607e70dd13fd856473d8c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jan 16 07:02:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 16 07:02:40 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: f3b6953e53\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907692\n\nChange-Id: I79a71a019405fcb31d1ae40062783247661cbf54\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f3b6953e5350ff6e56a607e70dd13fd856473d8c", "tree": "80ca4df1f6c3f595362cc0d6625aef7c437efe9a", "parents": [ "f3cbc5df1f140794428267eb45f44f9d57c81601", "8ce1d0abd195c24a75d9ddcb0ea31b1d1b62aaa6" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 12 10:15:31 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 12 10:16:06 2024 -0800" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027\n\n* aosp/upstream-master:\n Add ServiceProcessor to MainProcessor\n\nBug: 318750023\nTest: m javac-check\nChange-Id: Ie073f84085384b0cbfece22ad857bfe8eaa4e96a\n" }, { "commit": "8ce1d0abd195c24a75d9ddcb0ea31b1d1b62aaa6", "tree": "bd7e2a96b430c0acf5e608da9debf28b6cca9f5a", "parents": [ "07130d7bb682571c670ff3f1fcddcd5230a56b9d" ], "author": { "name": "Javac Team", "email": "java-team-github-bot@google.com", "time": "Fri Jan 12 09:52:32 2024 -0800" }, "committer": { "name": "Javac Team", "email": "javac-team+copybara@google.com", "time": "Fri Jan 12 09:53:07 2024 -0800" }, "message": "Add ServiceProcessor to MainProcessor\n\nThe previous CL lost the change to MainProcessor.java to run the new ServiceProcessor.\n\nPiperOrigin-RevId: 597868859\n" }, { "commit": "534f2834b71c8b1d8c932655fcac9d3ab931a849", "tree": "33d938e5065bcbe6125a60e4be0c9bcd02df8a77", "parents": [ "32f9cdb9971251d47711f7ab92535034f211042c", "0f07eb51cc5eb6324866f5853dde16d0bad75acc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 12 07:30:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 12 07:30:32 2024 +0000" }, "message": "Update METADATA am: f3cbc5df1f am: d9a2c2650d am: 0f07eb51cc\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907235\n\nChange-Id: I4471aed03e9b21b15e67193c57d2412cc6f9b97f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0f07eb51cc5eb6324866f5853dde16d0bad75acc", "tree": "33d938e5065bcbe6125a60e4be0c9bcd02df8a77", "parents": [ "70ed3f7c3aca8d262ea9ab7f26095cf7b44a8a19", "d9a2c2650dfb85a9f7033034a106e8773221d7aa" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 12 06:57:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 12 06:57:12 2024 +0000" }, "message": "Update METADATA am: f3cbc5df1f am: d9a2c2650d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907235\n\nChange-Id: I68336d0c813233e95c09c3f35dcd38879342896b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d9a2c2650dfb85a9f7033034a106e8773221d7aa", "tree": "33d938e5065bcbe6125a60e4be0c9bcd02df8a77", "parents": [ "78dac087a2ec946d7506d0bf5a740e800dae10fb", "f3cbc5df1f140794428267eb45f44f9d57c81601" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 12 05:37:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 12 05:37:40 2024 +0000" }, "message": "Update METADATA am: f3cbc5df1f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907235\n\nChange-Id: I828d0c9777b49c30e4e34a31d385bb42dbdce865\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "32f9cdb9971251d47711f7ab92535034f211042c", "tree": "bbdc3210bd87cfd074ad8101197caa632644e2d0", "parents": [ "7fd87366e2590f4d262ecb8929719a081d006352", "70ed3f7c3aca8d262ea9ab7f26095cf7b44a8a19" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 20:02:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 20:02:57 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: d7dff33e9c am: 78dac087a2 am: 70ed3f7c3a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901510\n\nChange-Id: Ieee1158174581abf972a5762a86f46a6a74747f6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "70ed3f7c3aca8d262ea9ab7f26095cf7b44a8a19", "tree": "bbdc3210bd87cfd074ad8101197caa632644e2d0", "parents": [ "220434db08c9669deb84cefb9aba0a2a47946b64", "78dac087a2ec946d7506d0bf5a740e800dae10fb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 19:31:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 19:31:30 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: d7dff33e9c am: 78dac087a2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901510\n\nChange-Id: I18474d7cac35343065d789033877a2287fdc6a95\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "78dac087a2ec946d7506d0bf5a740e800dae10fb", "tree": "bbdc3210bd87cfd074ad8101197caa632644e2d0", "parents": [ "488b81ea52d620fa1fe2a26632f063edce693a1c", "d7dff33e9cc6408ce3af3b3e0a248b7ba7cdb010" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 17:44:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 17:44:40 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: d7dff33e9c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901510\n\nChange-Id: Icca82d8994ca65705a60fb2a8380b3897dc048c7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f3cbc5df1f140794428267eb45f44f9d57c81601", "tree": "33d938e5065bcbe6125a60e4be0c9bcd02df8a77", "parents": [ "d7dff33e9cc6408ce3af3b3e0a248b7ba7cdb010" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 09:28:27 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 09:28:27 2024 -0800" }, "message": "Update METADATA\n\nBug: 318750023\nTest: N/A\nChange-Id: Ic9f084883fdf74e34796f9dbad583a7a18bbc658\n" }, { "commit": "7fd87366e2590f4d262ecb8929719a081d006352", "tree": "3ae6440e43808452f6c3be794a5bdd980d8df3ff", "parents": [ "1e35203de23d4ad6bc070ecd4bc501ae14253dde", "220434db08c9669deb84cefb9aba0a2a47946b64" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 17:26:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 17:26:37 2024 +0000" }, "message": "Add jarjar-tests am: 6834e66c0f am: 488b81ea52 am: 220434db08\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901509\n\nChange-Id: Ida942871640624c9dbfffd699ce3fdd1bedca163\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e35203de23d4ad6bc070ecd4bc501ae14253dde", "tree": "3e33025352f9eaf60636951e7e1931e4e56cc219", "parents": [ "efc94f5be58b55c9f34ad7df964d647eeaab8e74", "8647a4ea24926a81e1415aea5ddaa9c65a681869" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 17:26:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 17:26:34 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: 02bd81f6e8 am: cc522d0053 am: 8647a4ea24\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904651\n\nChange-Id: I35ac8cff6b1dc37e8639ed9fb80850edb4e79047\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "efc94f5be58b55c9f34ad7df964d647eeaab8e74", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "c3223a2c45534d0c752c3c4a31f5acbb97b5ed58", "5d00ceee6b5c5c7d7ba2cce6372ec082a729eaf4" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 17:26:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 17:26:31 2024 +0000" }, "message": "Merge inital Google commit into Android main am: c089ad6c08 am: bcaa09e8d4 am: 5d00ceee6b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904650\n\nChange-Id: I14eadc52f5be96f6256e4a6b30e75cbfacfffb83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "220434db08c9669deb84cefb9aba0a2a47946b64", "tree": "3ae6440e43808452f6c3be794a5bdd980d8df3ff", "parents": [ "8647a4ea24926a81e1415aea5ddaa9c65a681869", "488b81ea52d620fa1fe2a26632f063edce693a1c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 16:54:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 16:54:59 2024 +0000" }, "message": "Add jarjar-tests am: 6834e66c0f am: 488b81ea52\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901509\n\nChange-Id: I67accaa800d5db614872054dfba464ee78113ccf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8647a4ea24926a81e1415aea5ddaa9c65a681869", "tree": "3e33025352f9eaf60636951e7e1931e4e56cc219", "parents": [ "5d00ceee6b5c5c7d7ba2cce6372ec082a729eaf4", "cc522d005360220f685787d94739d65f6c9ee264" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 16:54:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 16:54:56 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: 02bd81f6e8 am: cc522d0053\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904651\n\nChange-Id: Icf1b70e87e1ab7171a2d2fbdbf69efb17e5eb721\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5d00ceee6b5c5c7d7ba2cce6372ec082a729eaf4", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "6c537075379dff3d5d7574b08cf1097c6a2b47f2", "bcaa09e8d483dd9963a3ca377d84bb4651bac2c1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 16:54:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 16:54:53 2024 +0000" }, "message": "Merge inital Google commit into Android main am: c089ad6c08 am: bcaa09e8d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904650\n\nChange-Id: I7b47a1b1a72846029a5d85364af3a2e8fc3d2309\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "488b81ea52d620fa1fe2a26632f063edce693a1c", "tree": "3ae6440e43808452f6c3be794a5bdd980d8df3ff", "parents": [ "cc522d005360220f685787d94739d65f6c9ee264", "6834e66c0f731fd9b0ac06343e44c95685376ca6" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 16:24:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 16:24:12 2024 +0000" }, "message": "Add jarjar-tests am: 6834e66c0f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901509\n\nChange-Id: I1d10f5297a3d77c11e4024560f1123d72967adab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cc522d005360220f685787d94739d65f6c9ee264", "tree": "3e33025352f9eaf60636951e7e1931e4e56cc219", "parents": [ "bcaa09e8d483dd9963a3ca377d84bb4651bac2c1", "02bd81f6e8ed4e197442e38798a04fd37862b2ee" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 16:24:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 16:24:09 2024 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027 am: 02bd81f6e8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904651\n\nChange-Id: I310c6b72bf019e13c6b933f9c74f76844e98b2fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bcaa09e8d483dd9963a3ca377d84bb4651bac2c1", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "6c537075379dff3d5d7574b08cf1097c6a2b47f2", "c089ad6c0806d0cd8466d125f2d1efd60d55032a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jan 11 16:24:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 16:24:04 2024 +0000" }, "message": "Merge inital Google commit into Android main am: c089ad6c08\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904650\n\nChange-Id: I5e59894947b6e77b09d4f52b51cc9d331a256df8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d7dff33e9cc6408ce3af3b3e0a248b7ba7cdb010", "tree": "bbdc3210bd87cfd074ad8101197caa632644e2d0", "parents": [ "6834e66c0f731fd9b0ac06343e44c95685376ca6", "07130d7bb682571c670ff3f1fcddcd5230a56b9d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 13:37:28 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 13:37:51 2024 -0800" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027\n\n* aosp/upstream-master:\n Add ServiceProcessor to rename and update META-INF/services files\n\nBug: 318750023\nTest: atest --host jarjar-tests\nChange-Id: Ic78ca3bfb04b11488e4dde17a938616fb75983e9\n" }, { "commit": "6834e66c0f731fd9b0ac06343e44c95685376ca6", "tree": "3ae6440e43808452f6c3be794a5bdd980d8df3ff", "parents": [ "02bd81f6e8ed4e197442e38798a04fd37862b2ee" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jan 08 14:09:40 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 13:33:46 2024 -0800" }, "message": "Add jarjar-tests\n\nBug: 318750023\nTest: atest --host jarjar-tests\nChange-Id: Ia917cc19cd6712d6ed37e303f49bbb0c37a99653\n" }, { "commit": "07130d7bb682571c670ff3f1fcddcd5230a56b9d", "tree": "1398138b282a8048c41a77f86a752c1ec5a4d446", "parents": [ "e11d5636aa45664271c8f1603067527b2520f591" ], "author": { "name": "Javac Team", "email": "java-team-github-bot@google.com", "time": "Wed Jan 10 13:03:42 2024 -0800" }, "committer": { "name": "Javac Team", "email": "javac-team+copybara@google.com", "time": "Wed Jan 10 13:04:15 2024 -0800" }, "message": "Add ServiceProcessor to rename and update META-INF/services files\n\nAdd ServiceProcessor to jarjar that renames META-INF/services files if the Service type has been remapped and remaps the contents of the file if the Service Provider has been remapped.\n\nPiperOrigin-RevId: 597333563\n" }, { "commit": "02bd81f6e8ed4e197442e38798a04fd37862b2ee", "tree": "3e33025352f9eaf60636951e7e1931e4e56cc219", "parents": [ "c089ad6c0806d0cd8466d125f2d1efd60d55032a", "e11d5636aa45664271c8f1603067527b2520f591" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 12:20:47 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 13:03:39 2024 -0800" }, "message": "Merge remote-tracking branch \u0027aosp/upstream-master\u0027\n\nMerge github.com/google/jarjar into the Android jarjar. This is mostly\ncosmetic changes, but also includes a few new features from google3:\nDon\u0027t block \u0027-\u0027 in replacement patterns (https://github.com/google/jarjar/commit/f271ac33748b682d312678d2f1c5c302edea5816)\nWork around lack of support for multi-version archives (https://github.com/google/jarjar/commit/38ff702d10baec78f30d5f57485ae452f0fe33b5)\n\nBug: 318750023\nTest: builds\nChange-Id: Ie452b8d00b0e52ae0c93de3f860574e98cc7f762\n" }, { "commit": "c089ad6c0806d0cd8466d125f2d1efd60d55032a", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "6c537075379dff3d5d7574b08cf1097c6a2b47f2", "7e8a1ea54c536409895184b2ab98d341926c6762" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 11:52:38 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 11:56:02 2024 -0800" }, "message": "Merge inital Google commit into Android main\n\nTest: N/A\nChange-Id: I440301fbe65364d22b2b8d78cb707bea8803cf5f\n" }, { "commit": "7e8a1ea54c536409895184b2ab98d341926c6762", "tree": "de9bb96cdb2bc7a710c8222edcdd3e3a33e7086e", "parents": [ "ab61347a2cb3254688c42c993278cefd43e5d99d", "75ee7c614bdbb7c6422c24f6815908d0d956432c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 11:51:45 2024 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jan 10 11:52:15 2024 -0800" }, "message": "Merge initial Google commit into initial Android commit\n\nTest: N/A\nChange-Id: I4c635f9c4cc87445e0c41faa9cef899b39d38e61\n" }, { "commit": "c3223a2c45534d0c752c3c4a31f5acbb97b5ed58", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "d72f92961db54c1639acc8fd593155b0490f9f39", "6c537075379dff3d5d7574b08cf1097c6a2b47f2" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Fri May 05 00:21:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 05 00:21:57 2023 +0000" }, "message": "Support META-INF and module-info am: 741153e061 am: 9c9e0b3a42 am: 8b3d1ab11c am: 25a5bc5726 am: 67d17ce238 am: 6c53707537\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2578874\n\nChange-Id: I5aa1b4219cee288659ac367197b36d075657cf60\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c537075379dff3d5d7574b08cf1097c6a2b47f2", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "d72f92961db54c1639acc8fd593155b0490f9f39", "67d17ce2387590438b4936b424800210123fb366" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Thu May 04 23:38:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 23:38:42 2023 +0000" }, "message": "Support META-INF and module-info am: 741153e061 am: 9c9e0b3a42 am: 8b3d1ab11c am: 25a5bc5726 am: 67d17ce238\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2578874\n\nChange-Id: I4620747a5203a21bceae2bd98337c07cf0c8e448\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "67d17ce2387590438b4936b424800210123fb366", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "d72f92961db54c1639acc8fd593155b0490f9f39", "25a5bc57264b7bdb42665b70892786f99a23834b" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Thu May 04 22:55:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 22:55:38 2023 +0000" }, "message": "Support META-INF and module-info am: 741153e061 am: 9c9e0b3a42 am: 8b3d1ab11c am: 25a5bc5726\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2578874\n\nChange-Id: I6d6a27ffa2cfd39ce3d68bf3325940bd7f70999b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "25a5bc57264b7bdb42665b70892786f99a23834b", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "d72f92961db54c1639acc8fd593155b0490f9f39", "8b3d1ab11c0409395d928d64f9b306f836d42ae0" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Thu May 04 22:11:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 22:11:43 2023 +0000" }, "message": "Support META-INF and module-info am: 741153e061 am: 9c9e0b3a42 am: 8b3d1ab11c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2578874\n\nChange-Id: I7c00227aedf98354c49ab400673f18579848554d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b3d1ab11c0409395d928d64f9b306f836d42ae0", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "fd103af85a566ccc65ca1b0efa4168673c0952cc", "9c9e0b3a429c180b242e09498ed8d32a05142f8a" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Thu May 04 21:25:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 21:25:52 2023 +0000" }, "message": "Support META-INF and module-info am: 741153e061 am: 9c9e0b3a42\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2578874\n\nChange-Id: I093756a79daaa5fe7f66639d86e0f2fb5049c4e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c9e0b3a429c180b242e09498ed8d32a05142f8a", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "fd103af85a566ccc65ca1b0efa4168673c0952cc", "741153e06175fbe4c2da2ad2ab8b704d9ab30259" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Thu May 04 20:45:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 20:45:43 2023 +0000" }, "message": "Support META-INF and module-info am: 741153e061\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2578874\n\nChange-Id: I7e273a0b3d354da3c2c818f76713ece848c0b68e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "741153e06175fbe4c2da2ad2ab8b704d9ab30259", "tree": "5d1f4e8fefa0df82f86b0960eadd3580f4e35f64", "parents": [ "fd103af85a566ccc65ca1b0efa4168673c0952cc" ], "author": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Tue May 02 13:59:42 2023 -0700" }, "committer": { "name": "Joe Baker-Malone", "email": "jbakermalone@google.com", "time": "Thu May 04 10:08:57 2023 -0700" }, "message": "Support META-INF and module-info\n\n\"Classes\" in META-INF (like module-info) shouldn\u0027t be moved based on\ntheir \"package name\" (that is, they shouldn\u0027t be moved to the root).\n\n\"module-info\" is now a valid identifier, similar to \"package-info\".\n\nTest: updated/fixed WildcardTest\nBug: 280496808\nChange-Id: I3da204998a3661a9c5beb6697b884a7bc8193392\n" }, { "commit": "d72f92961db54c1639acc8fd593155b0490f9f39", "tree": "b87e743b5021b2215ec626c84de22e9822be7883", "parents": [ "5a69cd63c8e95df25ee9a8f4f7414e97f4076351", "fd103af85a566ccc65ca1b0efa4168673c0952cc" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 21:14:46 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 21 21:14:46 2022 +0000" }, "message": "Merge \"Add information to METADATA file.\" am: ebfb572c53 am: 26cd5c5b6a am: fd103af85a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2309667\n\nChange-Id: If803ee3f916fb57d27358ac71f4c7f90ce56e2e7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5a69cd63c8e95df25ee9a8f4f7414e97f4076351", "tree": "a55488beab61275d68ff88df238bddd098672091", "parents": [ "7802d67e1465fd8de7f588ae600a04955b326177", "b22d29b77d8cf539fdf7074688d3521bb68028f8" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 21:11:53 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 21 21:11:53 2022 +0000" }, "message": "Merge \"Add LICENSE symbolic link.\" am: a7fd31970b am: f9011700de am: b22d29b77d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2309666\n\nChange-Id: Icbad5f9ed88128246e2c2254e6cf1f70a9c44239\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fd103af85a566ccc65ca1b0efa4168673c0952cc", "tree": "b87e743b5021b2215ec626c84de22e9822be7883", "parents": [ "b22d29b77d8cf539fdf7074688d3521bb68028f8", "26cd5c5b6a7227aede234ec531f827a489cc7c23" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 20:39:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 21 20:39:15 2022 +0000" }, "message": "Merge \"Add information to METADATA file.\" am: ebfb572c53 am: 26cd5c5b6a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2309667\n\nChange-Id: Ia9203c1388c9fcc66a6cb46c4c218002d9a8712a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b22d29b77d8cf539fdf7074688d3521bb68028f8", "tree": "a55488beab61275d68ff88df238bddd098672091", "parents": [ "26fad461b292d43da7aa5588b8bebe9640fed1ec", "f9011700de3de17a01c05a9240e07a28f89dfc8e" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 20:38:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 21 20:38:56 2022 +0000" }, "message": "Merge \"Add LICENSE symbolic link.\" am: a7fd31970b am: f9011700de\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2309666\n\nChange-Id: I4e8bb2b5ed3e7c2870ff5483296da0e6539f3c9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "26cd5c5b6a7227aede234ec531f827a489cc7c23", "tree": "b87e743b5021b2215ec626c84de22e9822be7883", "parents": [ "f9011700de3de17a01c05a9240e07a28f89dfc8e", "ebfb572c531d275bacc8701ef7d3141807ee5f25" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 20:13:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 21 20:13:02 2022 +0000" }, "message": "Merge \"Add information to METADATA file.\" am: ebfb572c53\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2309667\n\nChange-Id: Id4777301912ae5802136d68d8daa02e4d35751ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9011700de3de17a01c05a9240e07a28f89dfc8e", "tree": "a55488beab61275d68ff88df238bddd098672091", "parents": [ "13512a2a250befea55a2f5291d06605fa34fc8c3", "a7fd31970b38d7f84f807d7462518e1a9d70ef1c" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 20:12:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 21 20:12:31 2022 +0000" }, "message": "Merge \"Add LICENSE symbolic link.\" am: a7fd31970b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2309666\n\nChange-Id: Ia139e15480f0e3e65ef9c62a7a4fd2c7ad5bf655\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ebfb572c531d275bacc8701ef7d3141807ee5f25", "tree": "b87e743b5021b2215ec626c84de22e9822be7883", "parents": [ "a7fd31970b38d7f84f807d7462518e1a9d70ef1c", "7f7c4e8ce2c5b07d6f2649206c3a7ce701b046c3" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 19:34:34 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 21 19:34:34 2022 +0000" }, "message": "Merge \"Add information to METADATA file.\"" }, { "commit": "a7fd31970b38d7f84f807d7462518e1a9d70ef1c", "tree": "a55488beab61275d68ff88df238bddd098672091", "parents": [ "8771f310aa9a23d058de07dccaebf41117ae7b16", "f93f14149c87ee61675e4f6ba24a8d1f8fcd6ddd" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Mon Nov 21 19:34:20 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 21 19:34:20 2022 +0000" }, "message": "Merge \"Add LICENSE symbolic link.\"" }, { "commit": "7802d67e1465fd8de7f588ae600a04955b326177", "tree": "67506b7a9070509849ab04807e50e58130791abb", "parents": [ "a1ffcb685ef761ae223c786a50ee572283a325a5", "26fad461b292d43da7aa5588b8bebe9640fed1ec" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 21:37:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 18 21:37:57 2022 +0000" }, "message": "Use asm built from source. am: 8771f310aa am: 13512a2a25 am: 26fad461b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2305413\n\nChange-Id: Ie49ddedbc23a892f97ea2541b11b7b945aa7daa7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "26fad461b292d43da7aa5588b8bebe9640fed1ec", "tree": "67506b7a9070509849ab04807e50e58130791abb", "parents": [ "4a3e9015534b1c7ebbdc18b9f889f089e923eb31", "13512a2a250befea55a2f5291d06605fa34fc8c3" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 20:30:22 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 18 20:30:22 2022 +0000" }, "message": "Use asm built from source. am: 8771f310aa am: 13512a2a25\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2305413\n\nChange-Id: I2f41846a0f0df30b6b50d42fe7b6303b96063b92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "13512a2a250befea55a2f5291d06605fa34fc8c3", "tree": "67506b7a9070509849ab04807e50e58130791abb", "parents": [ "4a3e9015534b1c7ebbdc18b9f889f089e923eb31", "8771f310aa9a23d058de07dccaebf41117ae7b16" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 19:44:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 18 19:44:16 2022 +0000" }, "message": "Use asm built from source. am: 8771f310aa\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2305413\n\nChange-Id: Ib0cd60051266a59096e6f96de24cfcbf819515b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7f7c4e8ce2c5b07d6f2649206c3a7ce701b046c3", "tree": "d27d490c47b847db24f3153a3269a8fa3c56491a", "parents": [ "d3621fd17af424efc1fe4b527531e0b5282e77ee" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 19:17:34 2022 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 19:17:34 2022 +0000" }, "message": "Add information to METADATA file.\n\nTest: ComplianceLint\nChange-Id: Ia9e77a75142af332f726e59b57a9b0b4784064ce\n" }, { "commit": "f93f14149c87ee61675e4f6ba24a8d1f8fcd6ddd", "tree": "c6a3b4336a8a49ef85a32fdcdb57a602e38bfc5d", "parents": [ "d3621fd17af424efc1fe4b527531e0b5282e77ee" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 19:06:17 2022 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Nov 18 19:06:17 2022 +0000" }, "message": "Add LICENSE symbolic link.\n\nRequired by Android third-party code policy.\n\nTest: ComplianceLint\nChange-Id: I4f13b2783a368947e4c20151620ac39d42e3b080\n" }, { "commit": "8771f310aa9a23d058de07dccaebf41117ae7b16", "tree": "67506b7a9070509849ab04807e50e58130791abb", "parents": [ "d3621fd17af424efc1fe4b527531e0b5282e77ee" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Wed Nov 16 19:06:19 2022 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Wed Nov 16 19:06:19 2022 +0000" }, "message": "Use asm built from source.\n\nBug: 259136464\nTest: presubmit\nChange-Id: Ibcd4d98adf602194e3e8fc7cbb6135361f3d6af1\n" }, { "commit": "e11d5636aa45664271c8f1603067527b2520f591", "tree": "cafecbd87b47c255d669d4a0e9513d2fa915884e", "parents": [ "b176507568e47086d2d1166d76e26f42f3ff3a51" ], "author": { "name": "Liam Miller-Cushon", "email": "cushon@google.com", "time": "Fri Oct 21 11:21:17 2022 -0700" }, "committer": { "name": "Javac Team", "email": "javac-team+copybara@google.com", "time": "Fri Oct 21 11:21:43 2022 -0700" }, "message": "Use the latest ASM version in jarjar\n\nPiperOrigin-RevId: 482842530\n" }, { "commit": "b176507568e47086d2d1166d76e26f42f3ff3a51", "tree": "e405698d0411b81242dfa58ceb2beefbd782c231", "parents": [ "606c1d18585223de245014441709697f60dfdc4d" ], "author": { "name": "Liam Miller-Cushon", "email": "cushon@google.com", "time": "Mon Jun 06 14:36:51 2022 -0700" }, "committer": { "name": "Javac Team", "email": "javac-team+copybara@google.com", "time": "Mon Jun 06 14:37:29 2022 -0700" }, "message": "Opt out of AllStar checks because we use checked-in jars\n\nRelated: https://github.com/google/jarjar/issues/11\nPiperOrigin-RevId: 453285283\n" }, { "commit": "a1ffcb685ef761ae223c786a50ee572283a325a5", "tree": "c82d6d3ca63d0c10785e6e203e1e37485dc64f73", "parents": [ "970742e19721f1366256aae27e689f1a551052a5", "4a3e9015534b1c7ebbdc18b9f889f089e923eb31" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 14:24:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 14:24:13 2022 +0000" }, "message": "Update ASM usage to ASM9 for StripAnnotationsJarTransformer am: 9e6a26cd73 am: d43782d8d8 am: d3621fd17a am: e2ef1bd83b am: 4a3e901553\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2106351\n\nChange-Id: Ie33b59910187e0b3efd244d0ad26f76a3127b1ae\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4a3e9015534b1c7ebbdc18b9f889f089e923eb31", "tree": "c82d6d3ca63d0c10785e6e203e1e37485dc64f73", "parents": [ "ac70d6bba17d306a0e5230efb6a38c29648f971f", "e2ef1bd83b31626b5d3c3876d8eb5d45f93ca050" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 13:56:12 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 13:56:12 2022 +0000" }, "message": "Update ASM usage to ASM9 for StripAnnotationsJarTransformer am: 9e6a26cd73 am: d43782d8d8 am: d3621fd17a am: e2ef1bd83b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2106351\n\nChange-Id: I69cb111ef818ba46607148750b354ac26e66eaf1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e2ef1bd83b31626b5d3c3876d8eb5d45f93ca050", "tree": "c82d6d3ca63d0c10785e6e203e1e37485dc64f73", "parents": [ "5ba764dec879ba5b8f370e5c41d2a63cf05f7aed", "d3621fd17af424efc1fe4b527531e0b5282e77ee" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 13:32:47 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 13:32:47 2022 +0000" }, "message": "Update ASM usage to ASM9 for StripAnnotationsJarTransformer am: 9e6a26cd73 am: d43782d8d8 am: d3621fd17a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2106351\n\nChange-Id: I00cc9e25c6db52823c2cda4915774d77111bb73f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d3621fd17af424efc1fe4b527531e0b5282e77ee", "tree": "c82d6d3ca63d0c10785e6e203e1e37485dc64f73", "parents": [ "79c6383b54915d1d4af7766d05e4733559eb611e", "d43782d8d886a03a276beb718bdae31ecf847558" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 13:15:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 13:15:04 2022 +0000" }, "message": "Update ASM usage to ASM9 for StripAnnotationsJarTransformer am: 9e6a26cd73 am: d43782d8d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2106351\n\nChange-Id: Id45f29720ada45786c5bd573d45254779554f2b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d43782d8d886a03a276beb718bdae31ecf847558", "tree": "c82d6d3ca63d0c10785e6e203e1e37485dc64f73", "parents": [ "cfc4dab18ba6f097072a2ba945a024d79819229e", "9e6a26cd7316d38fd7cbe1b86def3ed77dc3eac4" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 12:55:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 25 12:55:00 2022 +0000" }, "message": "Update ASM usage to ASM9 for StripAnnotationsJarTransformer am: 9e6a26cd73\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2106351\n\nChange-Id: I79b45971b5c55081e92e343eff505ee8349003ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e6a26cd7316d38fd7cbe1b86def3ed77dc3eac4", "tree": "c82d6d3ca63d0c10785e6e203e1e37485dc64f73", "parents": [ "019476e4b5d29ee94831b3dee47d35199be51758" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 12:27:24 2022 +0100" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 25 12:27:24 2022 +0100" }, "message": "Update ASM usage to ASM9 for StripAnnotationsJarTransformer\n\nBug: 233029164\nTest: EXPERIMENTAL_TARGET_JAVA_VERSION_17\u003dtrue \\\n\t\t\t\t\t\t\t\t\t\t\t\tEXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN\u003dtrue m\nChange-Id: I393954478fbad657b85417e2a7344bb7dbe11b3d\n" }, { "commit": "970742e19721f1366256aae27e689f1a551052a5", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "7716da6c48d196ce2e1b77e59f96c4ec81d05212", "e29f80c58d6082a8a80ef78d74264629476a38c9" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 25 01:14:49 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 25 01:14:49 2022 +0000" }, "message": "Merge changes from topic \"cherrypicker-L03000000954755252:N17100001268198996\"\n\n* changes:\n [automerged blank] Speed up jarjar with prefix matches 2p: e1af5d0f48\n Speed up jarjar with prefix matches\n" }, { "commit": "7716da6c48d196ce2e1b77e59f96c4ec81d05212", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "eb4fd422857c3b625451c55d09f68dafc8ec034c", "ac70d6bba17d306a0e5230efb6a38c29648f971f" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 17:31:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 17:31:06 2022 +0000" }, "message": "Update ASM usage to ASM9 am: 019476e4b5 am: cfc4dab18b am: 79c6383b54 am: 5ba764dec8 am: ac70d6bba1\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2104327\n\nChange-Id: I8baafe8fe76f3622c2bcd78653096c8bcfd44372\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac70d6bba17d306a0e5230efb6a38c29648f971f", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "d71f2d6b88c5e474d81e793b40c4b2f6c6fba2d2", "5ba764dec879ba5b8f370e5c41d2a63cf05f7aed" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 16:59:52 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 16:59:52 2022 +0000" }, "message": "Update ASM usage to ASM9 am: 019476e4b5 am: cfc4dab18b am: 79c6383b54 am: 5ba764dec8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2104327\n\nChange-Id: I96a2b593169a3f7886ea2c8a5cc299f2d6581f33\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ba764dec879ba5b8f370e5c41d2a63cf05f7aed", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "b1a1069e3f2d394bb143bd768713c60c85cce0e7", "79c6383b54915d1d4af7766d05e4733559eb611e" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 16:36:24 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 16:36:24 2022 +0000" }, "message": "Update ASM usage to ASM9 am: 019476e4b5 am: cfc4dab18b am: 79c6383b54\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2104327\n\nChange-Id: I741274b5d858cef36de01dd73ca885b9b47f4ca1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "79c6383b54915d1d4af7766d05e4733559eb611e", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "046c2695d42230659695f872481d0e674fe0a0e9", "cfc4dab18ba6f097072a2ba945a024d79819229e" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 16:10:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 16:10:30 2022 +0000" }, "message": "Update ASM usage to ASM9 am: 019476e4b5 am: cfc4dab18b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2104327\n\nChange-Id: I7625b15987d74b991e257eb354d5feadb2886272\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cfc4dab18ba6f097072a2ba945a024d79819229e", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "5549152fd5d8bc27bd5e1a2ec36edd8c34e00d72", "019476e4b5d29ee94831b3dee47d35199be51758" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 15:36:14 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 15:36:14 2022 +0000" }, "message": "Update ASM usage to ASM9 am: 019476e4b5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2104327\n\nChange-Id: I377015960c774ee899ee1970ac1799c3a9eea51b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "019476e4b5d29ee94831b3dee47d35199be51758", "tree": "d0be614b63c67f6986734b5e3ee200bfe107a3a1", "parents": [ "e3db807ac093f42e2bf3d6ad3979a4a500cd4e49" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 12:22:49 2022 +0100" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue May 24 12:27:27 2022 +0100" }, "message": "Update ASM usage to ASM9\n\nBug: 233029164\nTest: EXPERIMENTAL_TARGET_JAVA_VERSION_17\u003dtrue \\\n\t\t\tEXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN\u003dtrue m\nChange-Id: Iabc9d129fddf919f7e06f82cc8133be30d9a733b\n" }, { "commit": "e29f80c58d6082a8a80ef78d74264629476a38c9", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "eb4fd422857c3b625451c55d09f68dafc8ec034c", "e1af5d0f485f5d5699a767de29a2a9432404db21" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 24 08:05:46 2022 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Tue May 24 08:05:46 2022 +0000" }, "message": "[automerged blank] Speed up jarjar with prefix matches 2p: e1af5d0f48\n\nBlank merge reason: Change-Id I3b7c1a7215ea8378b819ab0fe1f74b2b6fe8dcb5 with SHA-1 e3db807ac0 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/jarjar/+/18572902\n\nBug: 217129444\nBug: 233081774\nChange-Id: I7d5a02b93ca883e145afca9d0e29d5c2f127ad93\nMerged-In: I3b7c1a7215ea8378b819ab0fe1f74b2b6fe8dcb5\n" }, { "commit": "e1af5d0f485f5d5699a767de29a2a9432404db21", "tree": "2a9f3d874824add06dc8ca118304a27c8b27b546", "parents": [ "414c7d8b5d9db53fa96cf2351b53675e77bd3ba1" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri May 20 11:34:32 2022 +0900" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue May 24 08:05:38 2022 +0000" }, "message": "Speed up jarjar with prefix matches\n\nA common use-case for jarjar is to have rule with the format\nmy.package.name.**, or even my.package.name.MyClass with no wildcards.\nJarjar will convert that pattern to a regular expression and do regular\nexpression matching on every symbol it scans to determine if the rule\nmatches. This is very inefficient as most symbols will not match, and a\nsimple prefix match can rule out the match in most cases.\n\nWhen parsing rules, extract the plain-text prefix of each rule, which is\neverything before the first wildcard. Then index all rules by their\nprefix in a prefix trie. This allows:\n - Avoiding slow regular expression matches in most cases, as jarjar\n can immediately observe that there is no matching prefix in the map.\n - Scaling in O(log(n)) with the number of rules when they have distinct\n prefixes (instead of O(n), as a matching prefix can be found from the\n trie instead of looping through all rules.\n\nThis makes jarjar faster in current builds (running all jarjar rules to\nbuild a device back-to-back goes from 295s to 270s). For example:\n\nWith FrameworksNetTests (not part of device build):\nreal 0m48.580s -\u003e 0m24.507s\nuser 1m10.767s -\u003e 0m39.251s\nsys 0m12.029s -\u003e 0m12.099s\n\nWith service-wifi:\nreal 0m12.887s -\u003e 0m7.061s\nuser 0m26.274s -\u003e 0m20.519s\nsys 0m3.806s -\u003e 0m3.478s\n\nWith NetworkStack:\nreal 0m2.081s -\u003e 0m1.870s\nuser 0m7.119s -\u003e 0m6.230s\nsys 0m1.157s -\u003e 0m1.049s\n\nAll jars jarjared as part of a device build were checked to remain\nbyte-identical after this change.\n\nTest: m clean, m, grep out/verbose.log.gz for jarjar commands, run all\n commands with/without updated jarjar and check output is\n byte-identical.\nBug: 217129444\nBug: 233081774\n\nChange-Id: I3b7c1a7215ea8378b819ab0fe1f74b2b6fe8dcb5\n(cherry picked from commit e3db807ac093f42e2bf3d6ad3979a4a500cd4e49)\nMerged-In: I3b7c1a7215ea8378b819ab0fe1f74b2b6fe8dcb5\n" }, { "commit": "eb4fd422857c3b625451c55d09f68dafc8ec034c", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "b66ea05c31de0f665f7610ffc45720d75d036f15", "d71f2d6b88c5e474d81e793b40c4b2f6c6fba2d2" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 24 06:19:28 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 06:19:28 2022 +0000" }, "message": "Speed up jarjar with prefix matches am: e3db807ac0 am: 5549152fd5 am: 046c2695d4 am: b1a1069e3f am: d71f2d6b88\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2101594\n\nChange-Id: I66c94c4ecea3c6c2a1879314dd6cf866f2b0029b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d71f2d6b88c5e474d81e793b40c4b2f6c6fba2d2", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "934d8f06e4c8c1da888f767c04235a2d5922b3a0", "b1a1069e3f2d394bb143bd768713c60c85cce0e7" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 24 05:33:07 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 05:33:07 2022 +0000" }, "message": "Speed up jarjar with prefix matches am: e3db807ac0 am: 5549152fd5 am: 046c2695d4 am: b1a1069e3f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2101594\n\nChange-Id: I1d578beaf71bbece827b5ea0d66fc86d3bb1baf0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b1a1069e3f2d394bb143bd768713c60c85cce0e7", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "5976f804d3240917471369f179c1b15fdebd563b", "046c2695d42230659695f872481d0e674fe0a0e9" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 24 05:14:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 05:14:04 2022 +0000" }, "message": "Speed up jarjar with prefix matches am: e3db807ac0 am: 5549152fd5 am: 046c2695d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2101594\n\nChange-Id: I8b53193e0546498409ab39065558c616f9e3cbb6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "046c2695d42230659695f872481d0e674fe0a0e9", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "41407b062fb2048a2c16e51d520362fe755f9fbb", "5549152fd5d8bc27bd5e1a2ec36edd8c34e00d72" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 24 04:55:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 04:55:15 2022 +0000" }, "message": "Speed up jarjar with prefix matches am: e3db807ac0 am: 5549152fd5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2101594\n\nChange-Id: I8559fd826e633cd5c04f36c25e9d4f3197aad240\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5549152fd5d8bc27bd5e1a2ec36edd8c34e00d72", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "18e65b195aa2c46fc096a888035eb0e77080f125", "e3db807ac093f42e2bf3d6ad3979a4a500cd4e49" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 24 04:09:40 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 24 04:09:40 2022 +0000" }, "message": "Speed up jarjar with prefix matches am: e3db807ac0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2101594\n\nChange-Id: Ia3afff8ba0c0ab3083ef534645d40ac134be559d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e3db807ac093f42e2bf3d6ad3979a4a500cd4e49", "tree": "1f858c90042a5d29fdacf83559bc7e014a465c4a", "parents": [ "47f189c1e4728977bbecac5905c8bcc58c67c07e" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri May 20 11:34:32 2022 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Mon May 23 18:58:29 2022 +0900" }, "message": "Speed up jarjar with prefix matches\n\nA common use-case for jarjar is to have rule with the format\nmy.package.name.**, or even my.package.name.MyClass with no wildcards.\nJarjar will convert that pattern to a regular expression and do regular\nexpression matching on every symbol it scans to determine if the rule\nmatches. This is very inefficient as most symbols will not match, and a\nsimple prefix match can rule out the match in most cases.\n\nWhen parsing rules, extract the plain-text prefix of each rule, which is\neverything before the first wildcard. Then index all rules by their\nprefix in a prefix trie. This allows:\n - Avoiding slow regular expression matches in most cases, as jarjar\n can immediately observe that there is no matching prefix in the map.\n - Scaling in O(log(n)) with the number of rules when they have distinct\n prefixes (instead of O(n), as a matching prefix can be found from the\n trie instead of looping through all rules.\n\nThis makes jarjar faster in current builds (running all jarjar rules to\nbuild a device back-to-back goes from 295s to 270s). For example:\n\nWith FrameworksNetTests (not part of device build):\nreal 0m48.580s -\u003e 0m24.507s\nuser 1m10.767s -\u003e 0m39.251s\nsys 0m12.029s -\u003e 0m12.099s\n\nWith service-wifi:\nreal 0m12.887s -\u003e 0m7.061s\nuser 0m26.274s -\u003e 0m20.519s\nsys 0m3.806s -\u003e 0m3.478s\n\nWith NetworkStack:\nreal 0m2.081s -\u003e 0m1.870s\nuser 0m7.119s -\u003e 0m6.230s\nsys 0m1.157s -\u003e 0m1.049s\n\nAll jars jarjared as part of a device build were checked to remain\nbyte-identical after this change.\n\nTest: m clean, m, grep out/verbose.log.gz for jarjar commands, run all\n commands with/without updated jarjar and check output is\n byte-identical.\nBug: 217129444\nBug: 233081774\n\nChange-Id: I3b7c1a7215ea8378b819ab0fe1f74b2b6fe8dcb5\n" }, { "commit": "b66ea05c31de0f665f7610ffc45720d75d036f15", "tree": "81372424da9be7970fe78f49a7f39646d70b3400", "parents": [ "53c8ef64263a4d4b3cafafe99c7c35bebb497f0b", "934d8f06e4c8c1da888f767c04235a2d5922b3a0" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Thu May 12 04:03:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 12 04:03:37 2022 +0000" }, "message": "Add option to strip annotations from jar am: 47f189c1e4 am: 18e65b195a am: 41407b062f am: 5976f804d3 am: 934d8f06e4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2092603\n\nChange-Id: I1a46904d929f7c3a173a01f5ae7d33416b093660\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "934d8f06e4c8c1da888f767c04235a2d5922b3a0", "tree": "81372424da9be7970fe78f49a7f39646d70b3400", "parents": [ "845305798a7e45e04d9931512cc8fdc21978b63b", "5976f804d3240917471369f179c1b15fdebd563b" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 11 22:14:12 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 11 22:14:12 2022 +0000" }, "message": "Add option to strip annotations from jar am: 47f189c1e4 am: 18e65b195a am: 41407b062f am: 5976f804d3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2092603\n\nChange-Id: I5a2e759103b399e65b4f35c0ea4c3d90bbc77b60\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5976f804d3240917471369f179c1b15fdebd563b", "tree": "81372424da9be7970fe78f49a7f39646d70b3400", "parents": [ "845305798a7e45e04d9931512cc8fdc21978b63b", "41407b062fb2048a2c16e51d520362fe755f9fbb" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 11 21:28:29 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 11 21:28:29 2022 +0000" }, "message": "Add option to strip annotations from jar am: 47f189c1e4 am: 18e65b195a am: 41407b062f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2092603\n\nChange-Id: I57bc8b8f6993d61502d965fff15b0ae0b11354c2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41407b062fb2048a2c16e51d520362fe755f9fbb", "tree": "81372424da9be7970fe78f49a7f39646d70b3400", "parents": [ "845305798a7e45e04d9931512cc8fdc21978b63b", "18e65b195aa2c46fc096a888035eb0e77080f125" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 11 20:49:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 11 20:49:08 2022 +0000" }, "message": "Add option to strip annotations from jar am: 47f189c1e4 am: 18e65b195a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2092603\n\nChange-Id: Ia6b72059bccb2a960e25696b95b96d0fd65fd54b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "18e65b195aa2c46fc096a888035eb0e77080f125", "tree": "81372424da9be7970fe78f49a7f39646d70b3400", "parents": [ "31032fc2c9be767464028bbe32fd70eb3d9409e2", "47f189c1e4728977bbecac5905c8bcc58c67c07e" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 11 20:43:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 11 20:43:45 2022 +0000" }, "message": "Add option to strip annotations from jar am: 47f189c1e4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2092603\n\nChange-Id: I22d162b9ad82fafc58916a68026ce85569054a6a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "47f189c1e4728977bbecac5905c8bcc58c67c07e", "tree": "81372424da9be7970fe78f49a7f39646d70b3400", "parents": [ "1348173cadf1bc3ba94d4f54a5b8fd9995b5154a" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Mon May 09 13:24:51 2022 +0100" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed May 11 11:34:41 2022 +0100" }, "message": "Add option to strip annotations from jar\n\nBug: 222743634\nTest: m\nChange-Id: I095140c52959965ed28f82a9bb689aec191458d2\n" }, { "commit": "53c8ef64263a4d4b3cafafe99c7c35bebb497f0b", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "8a5297f327080dedadaf69a22e60316d5f766dbd", "414c7d8b5d9db53fa96cf2351b53675e77bd3ba1" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 18:47:23 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 22 18:47:23 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\" am: 1348173cad am: b32e2e9072 am: 31032fc2c9 am: 845305798a am: 414c7d8b5d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2016035\n\nChange-Id: I6adaa061a4c1abc68453c359d5acd91097a0f588\n" }, { "commit": "8a5297f327080dedadaf69a22e60316d5f766dbd", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "05700f129de4ae35a389cfdda626e98c728a8a81", "845305798a7e45e04d9931512cc8fdc21978b63b" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 18:28:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 22 18:28:02 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\" am: 1348173cad am: b32e2e9072 am: 31032fc2c9 am: 845305798a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2016035\n\nChange-Id: I68f950304d2b94c4f747c89bbf8e8246da90613a\n" }, { "commit": "414c7d8b5d9db53fa96cf2351b53675e77bd3ba1", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "05700f129de4ae35a389cfdda626e98c728a8a81", "845305798a7e45e04d9931512cc8fdc21978b63b" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 18:27:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 22 18:27:56 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\" am: 1348173cad am: b32e2e9072 am: 31032fc2c9 am: 845305798a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2016035\n\nChange-Id: Ifbbb09b57446a6d8ca2175c9bed6269fa99c811e\n" }, { "commit": "845305798a7e45e04d9931512cc8fdc21978b63b", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "05700f129de4ae35a389cfdda626e98c728a8a81", "31032fc2c9be767464028bbe32fd70eb3d9409e2" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 17:50:58 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 22 17:50:58 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\" am: 1348173cad am: b32e2e9072 am: 31032fc2c9\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2016035\n\nChange-Id: I8b855d4ab89bea3f6a14cda8e80275655cec9c0f\n" }, { "commit": "31032fc2c9be767464028bbe32fd70eb3d9409e2", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "72b4e91666700ffbfde14de738d8eef72ce32140", "b32e2e9072d03a57564f5253318c3d7bc2e6c8fa" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 17:43:35 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 22 17:43:35 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\" am: 1348173cad am: b32e2e9072\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2016035\n\nChange-Id: I6246a782b37a6ee8c58f474d9f5bd834b90e98ef\n" }, { "commit": "b32e2e9072d03a57564f5253318c3d7bc2e6c8fa", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "72b4e91666700ffbfde14de738d8eef72ce32140", "1348173cadf1bc3ba94d4f54a5b8fd9995b5154a" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 17:20:26 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 22 17:20:26 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\" am: 1348173cad\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2016035\n\nChange-Id: I14aba0d7bfeac9fb980b3c17e3d2fce4b79e05b5\n" }, { "commit": "1348173cadf1bc3ba94d4f54a5b8fd9995b5154a", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "72b4e91666700ffbfde14de738d8eef72ce32140", "3eba37a127040c8914ddfd1f062638dea7ee1303" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 22 17:03:20 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 22 17:03:20 2022 +0000" }, "message": "Merge \"Update asm-7.0 to asm-9.2.\"" }, { "commit": "3eba37a127040c8914ddfd1f062638dea7ee1303", "tree": "939329aa67c4ca133d179e19a26da863f5993a4a", "parents": [ "c3f940a08a68781d4ef97902942049fb05822308" ], "author": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 08 18:05:52 2022 +0000" }, "committer": { "name": "Allen Hair", "email": "allenhair@google.com", "time": "Tue Mar 08 18:51:20 2022 +0000" }, "message": "Update asm-7.0 to asm-9.2.\n\nBug: 194725917\nBug: 221938918\nTest: Forrest build.\nChange-Id: I7576994259325f571842fa7254e7f24527531fea\n" }, { "commit": "05700f129de4ae35a389cfdda626e98c728a8a81", "tree": "68521067eb6d24361e32a557f7e84fc85c8e7367", "parents": [ "c9fdcc319b85d1cfa79e8e2dea9ad40445ccd08b", "72b4e91666700ffbfde14de738d8eef72ce32140" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Dec 10 15:13:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 10 15:13:31 2021 +0000" }, "message": "Upgrading Jarjar to use ASM 7 am: b1373288c2 am: c3f940a08a am: d62d19d100 am: 72b4e91666\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1904174\n\nChange-Id: Ia8ac110a8229ff65e9b18c6fe20472d543aa39ff\n" } ], "next": "72b4e91666700ffbfde14de738d8eef72ce32140" }