)]}' { "log": [ { "commit": "7dceeeda41198c674c46197314601511f013c625", "tree": "f3a586a2908a454c9fdff6f15aca8e3f4c2f6a20", "parents": [ "33cc8b0aac29d87e132c7664763c03129271700d", "3c9fe76aa30a9bd02278082a37dee436537b1274" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Feb 11 02:24:49 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 11 02:24:49 2022 +0000" }, "message": "Merge \"convert StreamingProtoTest to stream proto type\" am: 5aba7d9d19 am: b873429660 am: 3c9fe76aa3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973039\n\nChange-Id: I04889e675fd92ec2678b8c8bcd4abbadb93e04a3\n" }, { "commit": "3c9fe76aa30a9bd02278082a37dee436537b1274", "tree": "1001fa44286127e7bb99d4669c241de66546196f", "parents": [ "88c5dcf785f00fd3915692d22b1c9e14938fce7c", "b8734296604c83e2b01fb41e00f3dd99299dcfeb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Feb 11 02:08:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 11 02:08:15 2022 +0000" }, "message": "Merge \"convert StreamingProtoTest to stream proto type\" am: 5aba7d9d19 am: b873429660\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973039\n\nChange-Id: I24bc44ef257214d429fae26200cc9efe2b796d4a\n" }, { "commit": "0156be866368d4a24ffa7604a5ec69c2c5037acf", "tree": "903718fb52a90300317776d05352d067f95e87df", "parents": [ "fa9d5b2e03c3fe367ddede0d0590973c4735bf47" ], "author": { "name": "Sam Delmerico", "email": "delmerico@google.com", "time": "Fri Feb 04 16:54:00 2022 +0000" }, "committer": { "name": "Sam Delmerico", "email": "delmerico@google.com", "time": "Fri Feb 04 16:54:00 2022 +0000" }, "message": "convert StreamingProtoTest to stream proto type\n\njava_library now supports using the \"stream\" type for proto properties,\nso we can use this type here to remove workaround.\n\nBug: 215230097\nTest: m StreamingProtoTest\nChange-Id: I365457c5392ef3e0ede39d9d36d0aa1f2951c902\n" }, { "commit": "e00127f167450049c98cf6cb7c0c03ce4a85e806", "tree": "9085a35b7b65860abb7abb91a0c11c28cf3162de", "parents": [ "47ee8d38a4b9632d134796ca1a00fa8f848ed363", "1b91eb31653851cd93d414a8a8a2de74769f7bcd" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 18 18:49:10 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 18 18:49:10 2022 +0000" }, "message": "Merge \"Setting ASM to version 7 in sdkparcelables\" am: e0029a5a87 am: 3a0e798ed9 am: 1b91eb3165\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689\n\nChange-Id: I46bc58714611c899c6e43b3b264c7ab5a270b04e\n" }, { "commit": "1b91eb31653851cd93d414a8a8a2de74769f7bcd", "tree": "89f5cf97e6efde25f5914197bf423077b5d2d509", "parents": [ "6c7a850439e8250f3e99c19d4f5629f5bb2f3ccb", "3a0e798ed905fdee60e4d01ebd8197e4313a4f65" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 18 18:31:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 18 18:31:00 2022 +0000" }, "message": "Merge \"Setting ASM to version 7 in sdkparcelables\" am: e0029a5a87 am: 3a0e798ed9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689\n\nChange-Id: I4cb9b88255dd582c73be2dfcfdfc7f232110c2ab\n" }, { "commit": "e95eaf7f5a94b723ae6597f79a42cd05de323ede", "tree": "8d342449cb61bb233b7869e9f7bb29dfc7d4652d", "parents": [ "6dc2fbcf278e8429ec5370f8968b86f852155c44" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Wed Jan 12 21:11:52 2022 +0000" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Tue Jan 18 09:03:12 2022 +0000" }, "message": "Setting ASM to version 7 in sdkparcelables\n\nThis is needed when using Java 11 as target.\n\nTest: m\nBug: 195387473\nChange-Id: I18abbdfee4039f9a366070b730930396ff4c210e\n" }, { "commit": "392bc3d40991bf11283e25db447f93137c87d1ce", "tree": "04ba75c4f362f47a4b4078d300bfbedfc19a5fb3", "parents": [ "33b835cb670242b42089ca0b69ca61ccfa5f2b0f", "081048aff1994ff2b5d4a990d6303a0ae57ae5a5" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Jan 14 17:09:44 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 17:09:44 2022 +0000" }, "message": "Merge \"Improve how \"likely an AOSP change\" is detected\" am: 0b0c098d36 am: 17ac2e2d80 am: 081048aff1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796\n\nChange-Id: Ibfc755f0d745ed056eedc36b586ee36b595c077e\n" }, { "commit": "081048aff1994ff2b5d4a990d6303a0ae57ae5a5", "tree": "1cba8c82e3c095cebee84368713543566bc678be", "parents": [ "6198337c7a97dc138aaab06eb8f54f43c0afaa7c", "17ac2e2d80b2acccb6ee58b63b6f242e48051e1d" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Jan 14 16:56:44 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 14 16:56:44 2022 +0000" }, "message": "Merge \"Improve how \"likely an AOSP change\" is detected\" am: 0b0c098d36 am: 17ac2e2d80\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796\n\nChange-Id: I564a443788f94a01c452b9a68d0317bd799ca0a9\n" }, { "commit": "2f51277ebfda930cac17b77df52a0dd2b222500f", "tree": "d441e08e392d0d9dbe9943ba90bbaf55329c2fc9", "parents": [ "2453899e69324c4c80d2a1deae248f224e8af6d6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Jan 13 15:25:06 2022 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Jan 13 17:30:18 2022 +0000" }, "message": "Improve how \"likely an AOSP change\" is detected\n\ngit branch -vv can be incredibly slow (over 5s on my machine/repo), so\nwhen aosp_sha.sh is called multiple times per commit, the repo upload\nhook can take a very long time to run (\u003e2 mins for my stack of changes).\n\nThe only output used from git branch -vv was the upstream of the current\nbranch, which can be determined in a much faster/simpler way via\nprinting the ref name of @{u} (git lingo for the upstream HEAD).\n\nTest: $ { aosp_sha.sh HEAD \u0026\u0026 echo ok || echo no } in aosp and internal\nChange-Id: I993496d8ec9e55c13803590bbb6c5d9d49cde158\n" }, { "commit": "72f49a1a3d9e03efa2717f6f9e038d51e1eb58fb", "tree": "e65efecb1c81d6635ed560c5b6f521b91e7b2fe5", "parents": [ "7cda9336dd300ab0c3508845f1fefc05713e232d", "28a89f18600f0f06bddcc3df3d6429c04144760f" ], "author": { "name": "Wei Su", "email": "weisu@google.com", "time": "Tue Jan 11 17:20:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 11 17:20:56 2022 +0000" }, "message": "Merge \"Write files in a temporary directory\" am: efa03939f0 am: 49eec50a4a am: 28a89f1860\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920049\n\nChange-Id: I3e26413428dea2deaeaa25146c65fae71c688718\n" }, { "commit": "28a89f18600f0f06bddcc3df3d6429c04144760f", "tree": "3f94883b1c7aa29614cb286be29d9f6bfc93f948", "parents": [ "be5132914ea52b7620d3e162c751ca390c591eb2", "49eec50a4af87b64ac3c82abd51c67a1899e64bc" ], "author": { "name": "Wei Su", "email": "weisu@google.com", "time": "Tue Jan 11 17:06:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 11 17:06:06 2022 +0000" }, "message": "Merge \"Write files in a temporary directory\" am: efa03939f0 am: 49eec50a4a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920049\n\nChange-Id: If2e8b41a886a316346b60da996ef3745835c1b0e\n" }, { "commit": "90d3fb6354d217a47a2da5c75d8d14aa49e0d80a", "tree": "cae9e293d3a6fbc25e9388ac7aa2ecb737904180", "parents": [ "d5bd84727573dc608bd7484052df6b575d83cc75" ], "author": { "name": "weisu", "email": "weisu@google.com", "time": "Sun Dec 12 22:24:52 2021 +0000" }, "committer": { "name": "weisu", "email": "weisu@google.com", "time": "Wed Jan 05 23:05:14 2022 +0000" }, "message": "Write files in a temporary directory\n\nAvoid writing test files in the build output directory which fails when\nrun with Bazel. This happens because Bazel\u0027s sandboxing environment\nensures that the test\u0027s working directory is unwritable.\n\nSee https://docs.bazel.build/versions/main/sandboxing.html for more\ninformation.\n\nBug: 209687942\nTest: atest --bazel-mode aapt2_tests\nTest: atest aapt2_tests\n\nChange-Id: I0fce701bbac255c3e308ad5c85aa27230c3b620b\n" }, { "commit": "1ced75e7b4e8e01ed2aab07dbef9f0b13b696fe0", "tree": "90f47cb87a4965f3896106a146c7c494bfc002d2", "parents": [ "59b0e876d4c31b437c2dc928a64bda92a61a2c54", "714440e6d396bd843317d1ea6129f09ce0f105e1" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Dec 10 14:57:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 10 14:57:49 2021 +0000" }, "message": "Merge \"Updating locked_region_code_injection to use ASM7\" am: 96bbb00369 am: 8c95814002 am: 714440e6d3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250\n\nChange-Id: I75b6280aac3f48d75f398d100d14365a7cd56408\n" }, { "commit": "714440e6d396bd843317d1ea6129f09ce0f105e1", "tree": "d4044a192915cfc13f0e7f63900109a25b3b93f0", "parents": [ "34ff50af3b01c4cd74f20846138de5ef046898dd", "8c958140027ea0964af5d224e5b0c4961d7fcf66" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Dec 10 14:44:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 10 14:44:04 2021 +0000" }, "message": "Merge \"Updating locked_region_code_injection to use ASM7\" am: 96bbb00369 am: 8c95814002\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250\n\nChange-Id: I1b26f25b55ad274fbdd8b39ef4209bda01e76b1e\n" }, { "commit": "8c958140027ea0964af5d224e5b0c4961d7fcf66", "tree": "b3caa7d25aebf5fdae225b077500cf17e54b0db7", "parents": [ "fcfa8b53454b7f745611bc53750e2f4a8914295c", "96bbb003694cc123d5a916c6310249ff076f76b8" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Dec 10 14:21:24 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 10 14:21:24 2021 +0000" }, "message": "Merge \"Updating locked_region_code_injection to use ASM7\" am: 96bbb00369\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250\n\nChange-Id: Id20e3b36b6bbd23c6415b01cb58ef55b362242e6\n" }, { "commit": "fc7aabcf2e390a8a8977f58ffb030b0c26b211ab", "tree": "5f7c612dae6553aa58fc09c9916407e4f1efdfe5", "parents": [ "8d221843b767e18c04c82bb972c8bbdfd459742b" ], "author": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Fri Nov 26 17:40:14 2021 +0000" }, "committer": { "name": "Sorin Basca", "email": "sorinbasca@google.com", "time": "Thu Dec 02 08:16:24 2021 +0000" }, "message": "Updating locked_region_code_injection to use ASM7\n\nBug: 195387073\nTest: m\nTest: EXPERIMENTAL_TARGET_JAVA_VERSION_11\u003dtrue m\nChange-Id: I34463d3da4d085697f441b4ca68007cafa9d7b69\n" }, { "commit": "ae3c5c80336b2e010594000ceb394d200ae0ee3b", "tree": "1f236953fead0e5a17633c9676427fa512c67be3", "parents": [ "289974b1951cb8206b44ea6274755350423d197c", "39465971f4031a5f3c3ea0047686a9a8ec2bfa1b" ], "author": { "name": "Vince Harron", "email": "vharron@google.com", "time": "Thu Nov 18 22:28:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 18 22:28:37 2021 +0000" }, "message": "Merge \"BSD grep doesn\u0027t support -P\" am: 3ad0c61146 am: 6e008cbb2a am: 39465971f4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500\n\nChange-Id: I4af27181e9739553d5395eddac05f96038d7e634\n" }, { "commit": "39465971f4031a5f3c3ea0047686a9a8ec2bfa1b", "tree": "db94d647bf92a941df11924080beecad3eab5c50", "parents": [ "085d433a74a96e498f8581c2c1108a3f5d112d36", "6e008cbb2abdf1985c0e463a6f3ee6aab99c8307" ], "author": { "name": "Vince Harron", "email": "vharron@google.com", "time": "Thu Nov 18 22:04:40 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 18 22:04:40 2021 +0000" }, "message": "Merge \"BSD grep doesn\u0027t support -P\" am: 3ad0c61146 am: 6e008cbb2a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500\n\nChange-Id: Ifae93b7302a5b2d743a4c996c91586da6f23e24e\n" }, { "commit": "6e008cbb2abdf1985c0e463a6f3ee6aab99c8307", "tree": "d7efdd4a83fc0b71ff353c21023861cc783392dd", "parents": [ "8fb8921a5dfb6e9a24b9aafdf327b7d03f554f7a", "3ad0c61146df875ecee78163c86224993e83eace" ], "author": { "name": "Vince Harron", "email": "vharron@google.com", "time": "Thu Nov 18 21:59:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 18 21:59:12 2021 +0000" }, "message": "Merge \"BSD grep doesn\u0027t support -P\" am: 3ad0c61146\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500\n\nChange-Id: Ib7267a0b908187432d1b7cd753ca27e707a2a2f1\n" }, { "commit": "10d9972786b9f564365b1f01af23b9df2ec00117", "tree": "9ca125a8245bdbd608c4e999b9ba287dcdd3bfcb", "parents": [ "d353c81c5c50494d66c8b4bce3294b3b8c86a38b", "0f473ac71a8dcefa15f377fe44c4f6003b6a518b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 18 17:00:37 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 18 17:00:37 2021 +0000" }, "message": "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918\n\nBug: 205056467\nMerged-In: I13199bc39e9445929195f3d15579cbffe94e92b0\nChange-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f\n" }, { "commit": "b3a17c77bef7b6113d724225a06e53301e12902c", "tree": "fae16167f1ce0d861dab684654355f72d8ea42fb", "parents": [ "9220245e47ed1198bf999caa9abe1df58c536153" ], "author": { "name": "Vince Harron", "email": "vharron@google.com", "time": "Fri Nov 12 18:28:01 2021 -0800" }, "committer": { "name": "Vince Harron", "email": "vharron@google.com", "time": "Wed Nov 17 22:32:57 2021 +0000" }, "message": "BSD grep doesn\u0027t support -P\n\nTest: New grep command tested on Linux and macOS\nBug: b/206150971\nChange-Id: I9f1684298672fee1561166a03392bd07be8c5cd6\n" }, { "commit": "94643cc013277966ac9755e5ea5cf9390480e673", "tree": "0f80286357f9652ec1538256dfeb3553448bf78c", "parents": [ "27f9c20511298bcfb01d8fb3c43064b2a21ea4b6", "4b7dd9fced0681aa82282337232d3ab939f7079c" ], "author": { "name": "Luke Edgar", "email": "lukeedgar@google.com", "time": "Thu Nov 11 11:02:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 11 11:02:04 2021 +0000" }, "message": "Merge \"AAPT Files - Permit invariant filepaths for getting file names\" am: 0ba2a37eaf am: c8b5598a14 am: b568a8202c am: 4b7dd9fced\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884590\n\nChange-Id: Ibcb2b129b94db1d3a83160c2b413792c24509c79\n" }, { "commit": "0ba2a37eafd802d240e602bfdc74fc4cfe0c07cd", "tree": "c949d41840c1f4c6c102397ff79814aeb488d272", "parents": [ "02842ed8649ea98ed4ec5ee64194ce2a64d20759", "9109a415b28aea8bf3bf668acbbbcdc28ca197ac" ], "author": { "name": "Luke Edgar", "email": "lukeedgar@google.com", "time": "Thu Nov 11 09:17:33 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 11 09:17:33 2021 +0000" }, "message": "Merge \"AAPT Files - Permit invariant filepaths for getting file names\"" }, { "commit": "9109a415b28aea8bf3bf668acbbbcdc28ca197ac", "tree": "988b8eff7b6a020f6b5ca0ec79633308b6ee246a", "parents": [ "eaebd2cd546f13c1082c092f522cf11dbc2eea9f" ], "author": { "name": "Luke Edgar", "email": "lukeedgar@google.com", "time": "Mon Nov 08 12:57:40 2021 +0000" }, "committer": { "name": "Luke Edgar", "email": "lukeedgar@google.com", "time": "Wed Nov 10 10:42:05 2021 +0000" }, "message": "AAPT Files - Permit invariant filepaths for getting file names\n\nAAPT compile provides a \"--source-path\" option that instructs aapt to\nuse a provided source path rather than the default source resource as\nresource orgin. However, this is not file system agnostic. This causes\nincorrect outputs of AAPT link, as source path parsing is tied to the\nfile system. This change ensures that AAPT Files::getFilename can parse\nfilepaths, regardless of file system filepath type.\n\nBug: 141301405, 155218379\nTest: manually tested on windows with a unix style filepath, passes aapt\ntests\nChange-Id: I548de01ad513b549dc30eb35d2a59813fa3d4e69\n" }, { "commit": "2999ac25fb27fb5d3f10c7ae541504045307aa45", "tree": "b9421e93162cc51de3db4f15ea9c51baff00284e", "parents": [ "fe2fa338bd0a20b2201cda882a574ad743f95941", "187863655c35e236d858209cba099e430744a6b9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Nov 09 18:28:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 09 18:28:20 2021 +0000" }, "message": "Merge \"Update the resources owner files\" am: 70d5485b28 am: bbf64f041e am: 2512fc7380 am: 187863655c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705\n\nChange-Id: I65f147d6f81268b215338bd40a138227ff8befa4\n" }, { "commit": "4c87aec35fe564fba4f0a5be3a23f03e9eca6b4f", "tree": "f467762cc668c0dde5697698cb0aa81a19da5fc6", "parents": [ "3120b13f56637dbbe272d85dce5c072df2f14f93" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Mon Nov 08 13:32:17 2021 -0800" }, "committer": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Mon Nov 08 16:25:33 2021 -0800" }, "message": "Update the resources owner files\n\nBug: 205633893\nTest: n/a\n\nChange-Id: Ib9cf70c9acb200e8019a6522cb6a85f85b760651\n" }, { "commit": "d5f12360fda7c5484a580391655a178cb8ada003", "tree": "b1dee374bd352d62de433463514514ea1c7e5359", "parents": [ "b91f1f4e8a278fb76a9cd2cb9529e07a8fc57a29", "af23af4c83d3fae11846479518aadcf8491e66ca" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Sat Nov 06 16:06:50 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Nov 06 16:06:50 2021 +0000" }, "message": "Merge \"Update AAPT for S V2.\" into sc-v2-dev am: af23af4c83\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16140646\n\nChange-Id: I6b713a4e45e82d2a0ed2a117d505cbd84aea4175\n" }, { "commit": "6aa3b2c86dcc8dc72b03c69e2ff3133baae4f10b", "tree": "5494a6bbf3c41402f8d8e75e51e6dac114639157", "parents": [ "7c1c6a691ccfe6b517c5c9b6a2dfd68932678908" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Thu Oct 28 17:05:25 2021 +0100" }, "committer": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Fri Nov 05 19:37:25 2021 +0000" }, "message": "Update AAPT for S V2.\n\nBug: 204295952\nTest: N/A\nChange-Id: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a\nMerged-In: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a\n" }, { "commit": "b9d75810d50afbea78429647c616218f799cfde4", "tree": "bc044cb79346802e891365bbe9b469ea29ef4e03", "parents": [ "db1380f10af560c6820cc9ece00ae362f28f10fd", "e9e1d94c4af4808bb779629e6add3ae35f4ad507" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Oct 27 23:42:35 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 27 23:42:35 2021 +0000" }, "message": "[res] Finalize resources in SC-v2 RESTRICT AUTOMERGE am: e9e1d94c4a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16102685\n\nChange-Id: Ie6cd8c3eecc0d8923aabe37447028072207803ca\n" }, { "commit": "db1380f10af560c6820cc9ece00ae362f28f10fd", "tree": "ebe99ef6ad9a2bff6d4c58bb4383819afc0127b0", "parents": [ "ba7d862103b1be5aeafa1832d796ffe9808258c7", "834f4e6c928d5e74202fc4b2e11510bcf4f79d8f" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Wed Oct 27 23:42:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 27 23:42:20 2021 +0000" }, "message": "[aapt2] Fix finalized resources removal am: 834f4e6c92\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16102684\n\nChange-Id: Iff52edf4399c67d2b0a6b4a9779f2825b277b4f0\n" }, { "commit": "e9e1d94c4af4808bb779629e6add3ae35f4ad507", "tree": "56cd81cc396538234eed6621441388d7b2eb5580", "parents": [ "834f4e6c928d5e74202fc4b2e11510bcf4f79d8f" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Thu Oct 21 01:37:23 2021 -0700" }, "committer": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Thu Oct 21 18:39:53 2021 +0000" }, "message": "[res] Finalize resources in SC-v2 RESTRICT AUTOMERGE\n\n+ modify the finalization script to support new mode -\n staging-public-group\n\n+ support removed items\n\nBug: 203782582\nTest: manual, aapt2 dump on the generated resources\n\nChange-Id: I507f85737d0ba5bf074dd8d98633087ff33c8382\n" }, { "commit": "834f4e6c928d5e74202fc4b2e11510bcf4f79d8f", "tree": "1006d0e8a067a1cb2afaec56ac3847dcf439d663", "parents": [ "0b4f292d62491a4f48757ac935d1301bf2e1d9e6" ], "author": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Thu Oct 21 09:13:18 2021 -0700" }, "committer": { "name": "Yurii Zubrytskyi", "email": "zyy@google.com", "time": "Thu Oct 21 09:36:00 2021 -0700" }, "message": "[aapt2] Fix finalized resources removal\n\nThe code used to expect all original staged resources to get\nparsed before their finalized version. Looks like that\u0027s not the\nactual case, and parsing code needs to expect those to come\nlater, and preserve the information that they aren\u0027t needed\nanymore\n\nBug: 203779955\nTest: manual, aapt2 dump resources \u003cfinalized framework SDK\u003e\nChange-Id: I6d9efe2eb7b406d05ca49a0a6ed745a1c509e2ef\n" }, { "commit": "bde331f9e730bf9da15e71a352d35698cb38b543", "tree": "1babb02ccdf8dd87cf9a784da447ae1ba30db096", "parents": [ "8fc90a41e02091732e60ec2bf842ba47c096c9e9", "4ebc6b077fcf000ee2b127e6d8108c2a775709c3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Sep 17 02:45:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 17 02:45:48 2021 +0000" }, "message": "Merge \"Fix framworks/base compiling against musl\" am: 2cba49ac56 am: d5b3d74850 am: 1559860d81 am: 4ebc6b077f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1828072\n\nChange-Id: Idee24ad18e175e6806aa933e8ec9f57ec87fba4a\n" }, { "commit": "d5b3d7485007828c88978d288846afbb9f7e7f02", "tree": "49654bce5af8c71a3016e2bd0d7b1c4e2f93aa6b", "parents": [ "5a4c7d4aaa0f96194669fb2fee6759da734410ea", "2cba49ac565cad88bef05e5bcb800525fa02c101" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Sep 17 02:02:58 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 17 02:02:58 2021 +0000" }, "message": "Merge \"Fix framworks/base compiling against musl\" am: 2cba49ac56\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1828072\n\nChange-Id: Icb43a2cb677d14772044cfe62e16e9cce5327f45\n" }, { "commit": "7cdbd68610d4af85498c656ef7cadc4d60168c45", "tree": "10edeb4156a80f6ef28805177ef2a47ff4ba4878", "parents": [ "733dd0f1e9e64493b167b9d3b771520dcfed0a13" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Sep 13 16:30:12 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 15 14:59:24 2021 -0700" }, "message": "Fix framworks/base compiling against musl\n\nAdd missing includes that are not transitively provided when compiling\nagainst musl.\n\nBug: 190084016\nTest: m USE_HOST_MUSL\u003dtrue\nChange-Id: Ia22c3df2e904e7a479bb636b7db22e5a0c341b98\n" }, { "commit": "ee9ceb96ca12f95860dd9b277cfcb77c731ea510", "tree": "bec204a5e8ee674eac781671303bf91f51ba95db", "parents": [ "6b1f0fd118f306defe42ab1bd563212d282b22c0", "dd1f40ff29c3b3c4c9f6a7f7cce7b449dc12c974" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 31 20:02:46 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 31 20:02:46 2021 +0000" }, "message": "Merge \"Mention the tag to use to bypass the AOSP-first check.\" am: 7c25a55f5d am: 542c95130e am: 82df844f9f am: dd1f40ff29\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778\n\nChange-Id: I4377130ed6fdd6866b4913b4f68b0599cc932a64\n" }, { "commit": "14c914335affa404011ec8f8af533e6adb5c00fe", "tree": "7d9da1c99e9afab99d6c801d7a986794782c2a37", "parents": [ "7c25a55f5ddd05e04d9fdd04845bb752b5f2c833", "e09648109071a56d596a9ab42e87bff56d83df04" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 31 19:20:31 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 31 19:20:31 2021 +0000" }, "message": "Merge \"Fix unused-but-set-variable warning\"" }, { "commit": "542c95130eb4a91fd223361b44c7adb3f7ee404f", "tree": "d387b55d158773b43781f0c6f928e7eac939c3a7", "parents": [ "e29dc9dfe148b46d0b3f838aebb941f92bab59fe", "7c25a55f5ddd05e04d9fdd04845bb752b5f2c833" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 31 19:03:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 31 19:03:39 2021 +0000" }, "message": "Merge \"Mention the tag to use to bypass the AOSP-first check.\" am: 7c25a55f5d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778\n\nChange-Id: Iaa9997aafcf6058e83a3d9286ec2bd2015d2efbe\n" }, { "commit": "b5cb84839cc5e38a4de97ae31848572926c08238", "tree": "28d40411eaf79501dc7a8b8c3a42a222e49cf32d", "parents": [ "5ae07b441f26555e17c6f3676bee9f0bf1a3aa09", "e44cc3552f76d3098477982dff3dddb773400638" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 31 19:03:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 31 19:03:37 2021 +0000" }, "message": "Merge \"Stop using `group_static_libs` property\" am: bc8a6d063b am: e29dc9dfe1 am: 452a9dfcd4 am: e44cc3552f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814336\n\nChange-Id: I7e181af4627d0e0afaab6a3a6ea6222effae044f\n" }, { "commit": "7c25a55f5ddd05e04d9fdd04845bb752b5f2c833", "tree": "78ffa57d5914954ca39b1f4a6f3fe928fbad64ae", "parents": [ "bc8a6d063b22f56d1fb95c8c5efa0d483602148a", "f1ca127e8af4194872d12799ebef7124c41e6e1a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 31 18:47:29 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 31 18:47:29 2021 +0000" }, "message": "Merge \"Mention the tag to use to bypass the AOSP-first check.\"" }, { "commit": "e29dc9dfe148b46d0b3f838aebb941f92bab59fe", "tree": "522419a979aa21c47568d7782f7524771e56969b", "parents": [ "872f7a88e54b1aa8c76c23099d6e78bdf82f8cdb", "bc8a6d063b22f56d1fb95c8c5efa0d483602148a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 31 18:07:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 31 18:07:45 2021 +0000" }, "message": "Merge \"Stop using `group_static_libs` property\" am: bc8a6d063b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814336\n\nChange-Id: Iae29e06901daae4b6f8d7f972ba938e2a94a5311\n" }, { "commit": "e09648109071a56d596a9ab42e87bff56d83df04", "tree": "bf93be267826596158b7cae2e2c1515336a50763", "parents": [ "93b4b55ee719427d877828871dd0837b34145d9c" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Sep 01 01:44:06 2021 +0800" }, "committer": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Sep 01 01:44:06 2021 +0800" }, "message": "Fix unused-but-set-variable warning\n\nTest: presubmit\nBug: 197240255\nChange-Id: I5cca354746213e9ef43e848dbc38ecbe168d0b6a\n" }, { "commit": "f1ca127e8af4194872d12799ebef7124c41e6e1a", "tree": "f8b849c8d66191d1001eda3fef092eeaa9807a9e", "parents": [ "93b4b55ee719427d877828871dd0837b34145d9c" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Tue Aug 31 16:49:11 2021 +0100" }, "committer": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Tue Aug 31 16:52:15 2021 +0100" }, "message": "Mention the tag to use to bypass the AOSP-first check.\n\nTest: `repo upload` with a CL in system/unwinding in an internal branch\nChange-Id: Ice32cbfbd12737771e5e7abcb590ed4d6b6da9b8\n" }, { "commit": "d010fb142deb52a195b06c0835c3333c5069400d", "tree": "e4a0676702d3cbaec34d4e898c37f71dc5be83e5", "parents": [ "116c3655637cc30409aa49f6c90380cc95c0b1e1" ], "author": { "name": "LaMont Jones", "email": "lamontjones@google.com", "time": "Mon Aug 30 23:20:05 2021 +0000" }, "committer": { "name": "LaMont Jones", "email": "lamontjones@google.com", "time": "Mon Aug 30 23:35:28 2021 +0000" }, "message": "Stop using `group_static_libs` property\n\nThis property is now ignored, so there is no need to set it.\nFor more details, see the bug and/or \"Effecient archive file handling\"\nin https://lld.llvm.org/NewLLD.html#key-concepts\n\nBug: 189475744\nTest: Manual build succeeds\nChange-Id: I79ff6aaba47fb13548d735b291da0796d416be48\n" }, { "commit": "bce29d1b6fc235a765fd6bb9d4dd44ff1dd3f93a", "tree": "3d42b224809ca76db103114f895363f21ed25160", "parents": [ "7f1cf1d238b871373b7fdd052b19d757f0df6d99", "cd14c3cf7618284cbc5d5c4fcafd4dd6e18ed1e0" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Fri Aug 27 10:36:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 27 10:36:12 2021 +0000" }, "message": "Merge \"[lint] add owners to frameworks/base/tools/lint\" am: 5834070338 am: 54a4e7a360 am: 0d12a65114 am: cd14c3cf76\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1809160\n\nChange-Id: I6af518bca858eb2f3e0000614e64fd8ac320bdef\n" }, { "commit": "54a4e7a360c26171d0f64ce3a613cc4f1268867b", "tree": "94594466f4c3d92f0207c47c080e607d2a8edcb4", "parents": [ "9ade5e2ffb35bf01180b30a5eef76b0f500c1fcc", "5834070338e1693a50ff5f8056c745c120cda0f4" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Fri Aug 27 00:32:38 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 27 00:32:38 2021 +0000" }, "message": "Merge \"[lint] add owners to frameworks/base/tools/lint\" am: 5834070338\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1809160\n\nChange-Id: Ie6e19ce58bb823ae259e80d1bb24347d9330c134\n" }, { "commit": "032e444c065a614716f42b5bef482e55fe8ce302", "tree": "dbdf34beedb817545149774fe7a613cffc517079", "parents": [ "2c0b1b672ef6a216084258a12e9d61f9c7d507f5" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Wed Aug 25 12:04:14 2021 -0700" }, "committer": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Thu Aug 26 19:30:51 2021 +0000" }, "message": "[lint] add owners to frameworks/base/tools/lint\n\nBUG: 197635708\nTest: none\nChange-Id: I81c85fa751bac2d3dfb4076096b5dd0920edf3f3\n" }, { "commit": "b8a44c6c21976c3734f8cc5fe1182309951abdce", "tree": "d112c57478b588122d0255af4f5a7bdbed32fd11", "parents": [ "365aeeda1f47e2e25d51cbc7f8f02b8ffbaf2713", "5f6036a5d1642bb283ae8c26da0715df44c1007e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Aug 21 16:58:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 21 16:58:14 2021 +0000" }, "message": "Merge \"Remove unused but set variables\" am: 97fe4d0cc4 am: 61555f903b am: 09a4234051 am: 5f6036a5d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802956\n\nChange-Id: Ibbc85953f6a8523644bf830990c0e6e67dcc02b5\n" }, { "commit": "61555f903bca395dbdbbed482d7ece9c38ff97bc", "tree": "d1b7462490d35a6949062a0c447cce0f78cedd97", "parents": [ "150af91f9c72e06faba858cb386106f097692e96", "97fe4d0cc4b37e2cc1e525c2de6d66e836aece60" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 19 23:16:57 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 19 23:16:57 2021 +0000" }, "message": "Merge \"Remove unused but set variables\" am: 97fe4d0cc4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802956\n\nChange-Id: Iddb6fffb5f33f324859b5a6be0c6f1034cda3558\n" }, { "commit": "82ac868c8c6c17d2c3eeee564962994cc65d433b", "tree": "c3dbd6d525d789f64a2342dab21f2f76c47a793b", "parents": [ "a6f81885390bf02ac5507ca96df0fe733429e549" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Fri Aug 20 02:48:22 2021 +0800" }, "committer": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Thu Aug 19 18:57:56 2021 +0000" }, "message": "Remove unused but set variables\n\nDiscovered by unused-but-set-variable diagnostics.\n\nTest: build\nBug: 197240255\nChange-Id: I32a1185f9714848c91860fbaa76521d490c842b9\n" }, { "commit": "2fb12c777d8a87deffccfa498e2a46d2ed52a2af", "tree": "6bd949106105240821e4e3da2ac94d6a8c1ac6ee", "parents": [ "bce33c97d4e7ce687a8d53f344757b26de90d55a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Aug 03 13:56:11 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 04 23:50:25 2021 +0000" }, "message": "Add Sv2 to aapt2 codenames\n\nBug: 193674948\nTest: m checkbuild\nChange-Id: Ibf94bae9be5767ffa1422e4d9800cc862dd64ffd\n" }, { "commit": "06be0817e209269318454526026b9aa562779323", "tree": "6e28e07c65376f5afef724237a02fb976236c53e", "parents": [ "fa8944c1a2a44947be6ec1884befb09dbe408608" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Aug 03 13:56:11 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 04 12:43:40 2021 -0700" }, "message": "Add Sv2 to aapt2 codenames\n\nBug: 193674948\nTest: m checkbuild\nMerged-In: I3f136f505bce80d0eb7f8b0cca316041730a4580\nChange-Id: Ibf94bae9be5767ffa1422e4d9800cc862dd64ffd\n" }, { "commit": "1bb97985f0d13bf016eb858c6da4ace713061215", "tree": "e322f31d9995e04b60d9f484e3277b624dbfd59c", "parents": [ "3923c3acc68d2d8f9beaab49122ce06cd876d1de" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 20 13:58:13 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jul 26 09:42:17 2021 -0700" }, "message": "Rename T to Tiramisu\n\nPLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.\n\nBug: 186121492\nBug: 194055070\nTest: m checkbuild\nChange-Id: I6882018a916dc1c71abc442068cb54fb9c42ff3c\nMerged-In: I6882018a916dc1c71abc442068cb54fb9c42ff3c\n(cherry picked from commit ff02f9a70ed9fa7cb3114f22db5290a316be661e)\n" }, { "commit": "ff02f9a70ed9fa7cb3114f22db5290a316be661e", "tree": "705d535639672b63bb01db820c0d7251bc9717f3", "parents": [ "0f9858962dff5d24467ee585c122aa348fb7fbf7" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 20 13:58:13 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jul 23 21:06:15 2021 +0000" }, "message": "Rename T to Tiramisu\n\nPLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.\n\nBug: 186121492\nBug: 194055070\nTest: m checkbuild\nChange-Id: I6882018a916dc1c71abc442068cb54fb9c42ff3c\nMerged-In: I6882018a916dc1c71abc442068cb54fb9c42ff3c\n" }, { "commit": "1c06cb829cbb98e38f55641a7835ad377dac0c5a", "tree": "e57ca381db21272a56b83cb5ed33ea8155d54bdb", "parents": [ "7405010f23758b09ac60e1e4b763efd4db3e253a" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Tue Nov 03 16:04:22 2020 -0800" }, "committer": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Wed Jun 30 17:25:59 2021 -0700" }, "message": "Hopefully fix validatekeymaps mac build.\n\nOnly link in libbinder for linux builds.\n\nBug: 172023026\nTest: m validatekeymaps\nChange-Id: Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4\nMerged-In: Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4\n" }, { "commit": "0a93841c46d1a42e1cd855455df830cd2a365feb", "tree": "6e7338a1d93630f81b0a86e0b2eacaeab08064d5", "parents": [ "49a82950f55f6dfcdc32f9ea4fdfdb4aac36d005", "80a8cf86c01618040a37643e4c73fc51fdf31bf9" ], "author": { "name": "Kohsuke Yatoh", "email": "kyatoh@google.com", "time": "Tue Jun 29 00:56:10 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 29 00:56:10 2021 +0000" }, "message": "Merge \"Extract flag font from NotoColorEmoji\" into sc-dev am: 80a8cf86c0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179\n\nChange-Id: If11584176cfc18d8580dc021fabf6fb8445b1cdc\n" }, { "commit": "9ed6166cb19e02426864f7af6c3e8799b5c652f4", "tree": "0ac234065b64659299334e6f3a598a271d8a8626", "parents": [ "8bae06f66da0d9539550ab59d88060114c79059c" ], "author": { "name": "Sean McQuillan", "email": "seanmcq@google.com", "time": "Fri Jun 25 16:21:06 2021 -0700" }, "committer": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Mon Jun 28 11:16:50 2021 -0700" }, "message": "cherry-pick: Update fontchain_linter.py to be compatible with Compat font\n\nBug: 186700756\nTest: m fontchain_lint\n\nMerged-in: Ibfe33f29f3db998fdc0db1bbf35851841ca73d9a\nChange-Id: Icfd3a8ee9e9bb4d877d721044a905ee7ecc6ed9a\n" }, { "commit": "458f1dd71c30c1595bec4b7df512746f0fc823bd", "tree": "c25b2d062bfb8ddf9c87fc4706c9b57e528f9c43", "parents": [ "3abf2a7ca976419e53fec8d057f580dfa5da7589" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Mon Jun 14 17:38:22 2021 -0700" }, "committer": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Thu Jun 24 18:46:08 2021 +0000" }, "message": "Extract flag font from NotoColorEmoji\n\nBug: 188926991\nBug: 188779144\nTest: m fontchain_lint\nChange-Id: Ie807e31abb407f5b58665d4d2941bc75186d5c42\nMerged-In: Ie807e31abb407f5b58665d4d2941bc75186d5c42\n" }, { "commit": "80865170cea94a6147978597303b2b0d5121c247", "tree": "5c9e4b0c8fd32140cedca93793153587d887ec9c", "parents": [ "0c1115f9b73d877e3e8209a4edb6ff263565c2a5", "c206d63edcf92522f7b86ef64f038502a9503b79" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Jun 04 22:20:08 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 22:20:08 2021 +0000" }, "message": "Merge \"Emit \"usesPermissionFlags\" in \"dump badging\".\" into sc-dev am: c206d63edc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019347\n\nChange-Id: I7e42cd52e8ba333dd00faa635767373d56adc30b\n" }, { "commit": "c206d63edcf92522f7b86ef64f038502a9503b79", "tree": "be7c96e663ebddbfcebdf658bf7b4532a23fa928", "parents": [ "a57d682aaf9d3ea230f01e1c04595b0fa0ee7211", "abcddfd12bb644213334ae445498dcce54f8b0f6" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Jun 04 22:06:55 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 04 22:06:55 2021 +0000" }, "message": "Merge \"Emit \"usesPermissionFlags\" in \"dump badging\".\" into sc-dev" }, { "commit": "0df037d6ae320f309ed1f3de25361456855210d4", "tree": "0105e6289c1873d46b314a49c9a9d5acfc4cf9bd", "parents": [ "9e2e3c3c53f5135b435a93b14645f059a4d874e9", "90b463900a0fc329692ae9492d208d418803f836" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jun 03 09:18:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 03 09:18:39 2021 +0000" }, "message": "Merge \"Support codename T in aapt2\" am: ff7bba27a8 am: 90b463900a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715428\n\nChange-Id: I6a9db68648a48c06bb0af370577b185d4cdcad04\n" }, { "commit": "b3a4448be34db05c122b26fce369ba376ffdeb86", "tree": "f55bec4a92ff1352b55d607f4e64dcd500420543", "parents": [ "36992991bd5b8a5a3a761283e0ed8c5d165c2d75", "e6fb6087aa433228cf0fb1a0d52d1a8721df38e3" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Wed Jun 02 20:14:07 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 02 20:14:07 2021 +0000" }, "message": "Merge changes from topic \"may27-sdk\" into sc-dev am: e6fb6087aa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815\n\nChange-Id: I9ac77657a3bde896f7a90fa9879daf66f5f7a35a\n" }, { "commit": "ff7bba27a8d8c50624b5922b130a83185807fede", "tree": "ad5c4135f120fb76e303034bfab31228842e505b", "parents": [ "ce765a74ca47a68fc84b69c17d1897a77eddb536", "a1250b59ab3f6bc5df92a37080aedb997ee04511" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 01 23:27:30 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 01 23:27:30 2021 +0000" }, "message": "Merge \"Support codename T in aapt2\"" }, { "commit": "de062e478c37e98ac61540c9e68af717d95ca9cf", "tree": "0819afdf941e2541ed455df938904152946decb6", "parents": [ "7c5f4337fd0b1fbcfe94b035601c67b1e7f47a2e" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu May 27 13:12:27 2021 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 01 06:48:52 2021 -0600" }, "message": "Finalize resource IDs; script to help in future.\n\nBug: 171506470\nTest: Build\nChange-Id: I7b7360475ff0f6f4d4c8b8872eefc4e80fd9640e\n" }, { "commit": "7c5f4337fd0b1fbcfe94b035601c67b1e7f47a2e", "tree": "278b080be1b56d276b8363ad717e07fa579b577a", "parents": [ "1dfd948440af4fa2e859b698cb0fa1770c89d4ee" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu May 27 09:26:59 2021 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 01 06:48:51 2021 -0600" }, "message": "platform/frameworks/base/ - S is now 31\n\nBug: 171506470\nTest: Build\nChange-Id: I46d4df5f27783a96a58c966b113391ea3bc112cb\n" }, { "commit": "2a696f7a18493e356b58e964fec072b3687c957e", "tree": "b743aa8bed8ce878675299bfba067da399d1a1e1", "parents": [ "ac729b84306ad71aa9889d566440e8c23a95d5da", "163db52409af13bc2aad8a04d94caecb5d62c2f5" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Wed May 26 21:14:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 26 21:14:30 2021 +0000" }, "message": "Merge changes from topic \"may26-dab\" into sc-dev am: 163db52409\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14738430\n\nChange-Id: Idfbd586484a6fc76a2003456341932bfa8b6baaf\n" }, { "commit": "13bc791d511b4ee0c7ea55747df047eb1be03580", "tree": "84fc57de6684f1b7ab60f8d0c64a39c1a917cf5b", "parents": [ "bb93c00164dc0c8d6106a2691864ef4e45e517bf" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue May 25 19:26:00 2021 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed May 26 12:07:25 2021 -0600" }, "message": "Reintroduce \"Deprecated at Birth\" linter.\n\nEarlier this year the \"apilint.py\" script was removed from the build,\nsince it\u0027s been replaced by Metalava. However, several features\nhaven\u0027t been ported yet, so this change revives them to support the\nSDK finalization process.\n\nThis change also updates the script to handle \"Signature format: 2.0\"\nfiles, and reads the API surface from a directory which contains\nseveral \".txt\" files to support the new Mainline API structuring.\n\nBug: 189224267\nTest: manual\nChange-Id: Ifc4c24a7e159db6725897800d67947d1fd8b9880\n" }, { "commit": "31c1300fe15a86046bf3e6112e401d98191cd81e", "tree": "54aae6c496080a5c363a4b3d6bea9dccb20c8106", "parents": [ "7146bb3dd09164cd04ff1529e60fa9ffe90d965b", "a63e111574f9348150d4a150cf2cc2923fdcb7d2" ], "author": { "name": "Seth Moore", "email": "sethmo@google.com", "time": "Wed May 26 16:27:41 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 26 16:27:41 2021 +0000" }, "message": "Merge \"Check for Ignore-AOSP-First commit tag\" into sc-dev am: a63e111574\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703967\n\nChange-Id: If7120daa47a8fd6d3b01afa2d7bae9826bf3b1ea\n" }, { "commit": "f3d78421ba45ad5661f073795b3dc57411c2f09b", "tree": "354969dacbd122c2d9526c3468010ddcc4e12b96", "parents": [ "766605521e19917ce305f29429dee99b0955e7dd" ], "author": { "name": "Seth Moore", "email": "sethmo@google.com", "time": "Mon May 24 13:43:35 2021 -0700" }, "committer": { "name": "Seth Moore", "email": "sethmo@google.com", "time": "Wed May 26 09:17:27 2021 -0700" }, "message": "Check for Ignore-AOSP-First commit tag\n\nIf the Ignore-AOSP-First tag is in a commit message, it means the\ncommitter is intentionally bypassing the AOSP source of truth. Check\nfor this tag in the AOSP-first presubmit hook so that devs don\u0027t have\nto turn off hooks to get past the AOSP-first policy in exceptional\ncases.\n\nBug: 189139990\nChange-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f\nMerged-In: I18231b93d7f213c13ace0a0af24bb20a394cc50f\nTest: Manual testing with various commit messages\n" }, { "commit": "a63e111574f9348150d4a150cf2cc2923fdcb7d2", "tree": "cf4a6e0be04aa62aeccb21d7dc083e67db2a29f2", "parents": [ "b8945154d0d1927853c98b5817f69e113bf8f5c8", "627b9ca3b706d6205216fd7e3726cbed45300a1a" ], "author": { "name": "Seth Moore", "email": "sethmo@google.com", "time": "Wed May 26 16:02:06 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 26 16:02:06 2021 +0000" }, "message": "Merge \"Check for Ignore-AOSP-First commit tag\" into sc-dev" }, { "commit": "627b9ca3b706d6205216fd7e3726cbed45300a1a", "tree": "a9ce77fb7c9a68dc8465dffb8602fcd10e1c54b3", "parents": [ "5fcdcebfd24a303409d25d29ec1093cc09091307" ], "author": { "name": "Seth Moore", "email": "sethmo@google.com", "time": "Mon May 24 13:43:35 2021 -0700" }, "committer": { "name": "Seth Moore", "email": "sethmo@google.com", "time": "Mon May 24 14:15:36 2021 -0700" }, "message": "Check for Ignore-AOSP-First commit tag\n\nIf the Ignore-AOSP-First tag is in a commit message, it means the\ncommitter is intentionally bypassing the AOSP source of truth. Check\nfor this tag in the AOSP-first presubmit hook so that devs don\u0027t have\nto turn off hooks to get past the AOSP-first policy in exceptional\ncases.\n\nBug: 189139990\nChange-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f\nTest: Manual testing with various commit messages\n" }, { "commit": "dff37ee6d22b24055d2d2bd9e2bb7f3e2f8f60bc", "tree": "db657093c495ddf0328e8f08f149aa437cbfa57b", "parents": [ "5fcdcebfd24a303409d25d29ec1093cc09091307", "43628ca24cda9f3d073e21a2a33d400d981e03c1" ], "author": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Mon May 24 18:30:19 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 24 18:30:19 2021 +0000" }, "message": "Merge \"Updates OWNERS files\" into sc-dev" }, { "commit": "43628ca24cda9f3d073e21a2a33d400d981e03c1", "tree": "cbab1fd3b299e9cc19cf17c2ced36e416c5565d0", "parents": [ "c06af26cc02000b1dd5748176eddc54cdd13b6ae" ], "author": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Thu May 13 11:25:29 2021 -0700" }, "committer": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Fri May 21 14:13:18 2021 -0700" }, "message": "Updates OWNERS files\n\nBug: 186864416\nTest: Builds\nChange-Id: I04dfc5c2c7143825334ebc62742e335b8c889492\n" }, { "commit": "a1250b59ab3f6bc5df92a37080aedb997ee04511", "tree": "9a327c237841238e7fc242048433c55a8b3d2477", "parents": [ "c4099ac074e020f9998120c311e84ddd54c86d96" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu May 13 16:32:15 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 21 10:23:17 2021 -0700" }, "message": "Support codename T in aapt2\n\nBug: 186121492\nTest: treehugger\nChange-Id: I3f136f505bce80d0eb7f8b0cca316041730a4580\n" }, { "commit": "a73daaeb5c296cfb3cd7722f40eac5fcbec118f2", "tree": "1ae2e0280cd1e61e4236721929f45ee9252112e0", "parents": [ "29cccc0b0e083d19e51e306e038cd363bc01a251", "47e58f1238323c2e15f85555726325c21f09372f" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Thu May 20 23:37:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 20 23:37:22 2021 +0000" }, "message": "Merge \"Do not call pop_back when app has no uses-sdk\" into sc-dev am: 47e58f1238\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167\n\nChange-Id: I05aad42f7077ee8f285e8df581608e872731834c\n" }, { "commit": "6ea9ed3d5f4673900a99c20cc4dab6fd27e60bba", "tree": "98d8e909db68acf96f1c7d7382fa59d9330adc6a", "parents": [ "33517fcf9a90de9ff0be835e5bf72b656e278e29" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Thu May 20 11:38:57 2021 -0700" }, "committer": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Thu May 20 13:55:12 2021 -0700" }, "message": "Do not call pop_back when app has no uses-sdk\n\nCalling pop_back on an empty container results in undefined behavior.\naapt2 dump badging seg faults when used on an APK with no uses-sdk.\n\nBug: 188461703\nTest: aapt2 dump badging HelloAppTest.apk\nChange-Id: I8d8308a06d542f003ae399629bdbfb5b845674fc\n" }, { "commit": "d1172f3b0481d0a0fd5755c7f795d245873c2976", "tree": "2bb3ef8e1a175322a68db705a5a0c7ddc3132c0d", "parents": [ "832ce8f9252cac92cd8a09f992362a861715554d", "6733d0ef8ab69598bad0e4c7527d6e92fc6039dc" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue May 18 23:36:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 18 23:36:45 2021 +0000" }, "message": "Merge \"Add a cherry-pick exception.\" am: 9510033467 am: 6733d0ef8a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1711190\n\nChange-Id: I81ac1a60ab33b059488109f1aa7efada363bb3ff\n" }, { "commit": "6a958235ec6efd2d9cea45e095fde89d41c7942a", "tree": "2c47f57488d23a055242e5a8af0cc4f063edc62c", "parents": [ "edd6684f8879aa69a12671fec535bdcdae5c1e25", "c4db697186c4e56c24bec2cee7b16de27facedd8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 18 23:17:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 18 23:17:14 2021 +0000" }, "message": "Merge \"Revert^2 \"Fix incompatibilities with Kotlin 1.5.0\"\" am: b7bccf0c76 am: c4db697186\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709778\n\nChange-Id: If3e51f818d2ac479af7f829b0781fbefffe028f4\n" }, { "commit": "62bf50bbd89c89d80872d2862b65bfb1383d7dde", "tree": "3611ba568d51568905d598e914849cb07c2c4223", "parents": [ "68110bcb24d5edc3a5a016dbe3552a60a2acd08f", "4c56bac29534c91c697131488a11a55352ec9b39" ], "author": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Tue May 18 23:16:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 18 23:16:02 2021 +0000" }, "message": "Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089\n\nChange-Id: Ibea92e6623d660b0bcbc324c8f188642841160dd\n" }, { "commit": "9510033467ccbcf64d9921ec1419da62b0050db0", "tree": "8a577777ec6a677c8029b90e7e263b163b6c6f32", "parents": [ "a4466fbe61f995548ce6041f6b5024e0c9d4c6f5", "9fbe8a82795a335a5c1452a92c691696dffda4c6" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue May 18 22:50:29 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 18 22:50:29 2021 +0000" }, "message": "Merge \"Add a cherry-pick exception.\"" }, { "commit": "b7bccf0c76934bef1648529eb79ca8afb60c818a", "tree": "76b645caea0fb2193c90fefe46b82558f7f0ec5b", "parents": [ "9635abafa0053c65e04b93da16c72da8af371454", "b715c4d7301d45b8e2ff0308ee6eefc6ffdee2f0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 18 20:54:38 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 18 20:54:38 2021 +0000" }, "message": "Merge \"Revert^2 \"Fix incompatibilities with Kotlin 1.5.0\"\"" }, { "commit": "9fbe8a82795a335a5c1452a92c691696dffda4c6", "tree": "53af8d708c5b84603dbaa60edc23e346b98c83bc", "parents": [ "6c914b4bc61235d6a4ff3cc468de6eac286aadf8" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue May 18 13:49:08 2021 -0700" }, "committer": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue May 18 13:49:08 2021 -0700" }, "message": "Add a cherry-pick exception.\n\nIf someone is trying to cherry-pick back to aosp, don\u0027t force them\nto use --no-verify, allow it.\n\nRight now, the only form of cherry-pick allowed is:\n\n cherry picked from\n\nTest: Ran on a commit with the message and without and observed that\nTest: with the cherry pick message, no error, without, error message.\nChange-Id: I27581f782cdc1a1c4fa207a3aae392c0d434eb5a\n" }, { "commit": "1ef34e902235c933c0ffd034df285d85b41e2427", "tree": "8447d205a4bf02c0bedcd30d8f3741b331683296", "parents": [ "c4099ac074e020f9998120c311e84ddd54c86d96", "e6c0a4f8ce5038e4d113c5962b115414bd754986" ], "author": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Tue May 18 19:03:06 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 18 19:03:06 2021 +0000" }, "message": "Merge changes I04dfc5c2,Idc7e1f3c\n\n* changes:\n Updates OWNERS files\n Update OWNERS file.\n" }, { "commit": "b715c4d7301d45b8e2ff0308ee6eefc6ffdee2f0", "tree": "9c0dafc4fee3f99c7236788cd46bb9eb1f366151", "parents": [ "c5b4071877530ba3eb6ce5f55fc8c101ea1f35e4" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Mon May 17 17:41:41 2021 +0000" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Mon May 17 17:41:41 2021 +0000" }, "message": "Revert^2 \"Fix incompatibilities with Kotlin 1.5.0\"\n\nc5b4071877530ba3eb6ce5f55fc8c101ea1f35e4\n\nChange-Id: I1fc09f028411cce8bdaa9eec68eaf88116f2143f\n" }, { "commit": "e6c0a4f8ce5038e4d113c5962b115414bd754986", "tree": "9d2f314bcff02ae265ce807cc2ef4d4b5745e853", "parents": [ "afbce365aea4b3c37e203c8284d1cac357836a0b" ], "author": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Thu May 13 11:25:29 2021 -0700" }, "committer": { "name": "Patrick Baumann", "email": "patb@google.com", "time": "Fri May 14 15:45:42 2021 +0000" }, "message": "Updates OWNERS files\n\nBug: 186864416\nTest: Builds\nChange-Id: I04dfc5c2c7143825334ebc62742e335b8c889492\n" }, { "commit": "05ba318dfc587d6b06228d92bf6db6d18f96fc8d", "tree": "f723ed5c18ddd8ee38a4ccc7e60e9c8783f1d1ab", "parents": [ "c9a8383c2204a21ee5d9bb7b4a2d6f2462b23322", "9853e8a94e45ce82b0295d54afd6b199cd619e48" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu May 13 19:44:55 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 13 19:44:55 2021 +0000" }, "message": "Merge \"Remove a use of String16::remove.\" am: 0529640cc0 am: c881ac71b5 am: 9853e8a94e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170\n\nChange-Id: I31b89ce8b8504388deab49d9af7410f8d64b78fd\n" }, { "commit": "b357fadd1ed9c7d073b358864953113214d537b8", "tree": "40e1fa65b45caa9bf17b58f4a71cec75d1404621", "parents": [ "dd9dcdfb72b89002122ecbe03606b78d4012899f", "51a1b7d0825095429054d639e7aecb882a930229" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed May 12 23:09:41 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 12 23:09:41 2021 +0000" }, "message": "Merge \"Revert \"Fix incompatibilities with Kotlin 1.5.0\"\" am: f1e2bb9a81 am: c2db9c85cc am: 51a1b7d082\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633\n\nChange-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118\n" }, { "commit": "c5b4071877530ba3eb6ce5f55fc8c101ea1f35e4", "tree": "252e33b26e09220f10e51ed33f1f02299321dba9", "parents": [ "b8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed May 12 21:56:31 2021 +0000" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed May 12 21:56:31 2021 +0000" }, "message": "Revert \"Fix incompatibilities with Kotlin 1.5.0\"\n\nThis reverts commit b8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911.\n\nReason for revert: b/187908823\n\nChange-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d\n" }, { "commit": "0523328a0081f20890d88d7ce348e66dfa179d42", "tree": "4d5d28588581b46fac39d72cbca5f1e91a017829", "parents": [ "61f27d7d5242fdf41478d416fe7090995be9d499" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue May 11 16:24:35 2021 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue May 11 16:24:35 2021 -0700" }, "message": "Remove a use of String16::remove.\n\nThis function, ironically, is being removed. This is one of only two\nusers, and it\u0027s pretty hard to use correctly. In this case, using one\nof the existing constructors to keep a prefix seems clearer even in a\nworld where remove() was better implemented.\n\nTest: treehugger\nChange-Id: Icdf02d9fcc059c396c13787d9bb4e8bda5658656\n" }, { "commit": "4c9b195caed851e01322a9509aaa476f15e760dd", "tree": "f1ff8e9e1bd3d6201cb8b86abda9aca39bbd0a16", "parents": [ "59ea888741694708a39d88187f33eccc1eb1e632", "c61fdfd2d11e4261b333db4f5ac9845c5e5ed055" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue May 11 21:20:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 11 21:20:45 2021 +0000" }, "message": "Merge \"Fix incompatibilities with Kotlin 1.5.0\" am: 600dcaf908 am: 70ba49b0e5 am: c61fdfd2d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314\n\nChange-Id: I4c76908e0cf9a1ba0493322c1f8dedb4fa925e80\n" }, { "commit": "30f6ef3a7b6408df40c7ad77aeecf6acd9b808d6", "tree": "362968d1ef2e507ef434ed40a2462a7c51f1022d", "parents": [ "cc3c259e526e7839fccd91a0090e1516b5e7da28", "3965584d3a988e9a551ce0d96812f3923e01b0b5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 11 21:05:42 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 11 21:05:42 2021 +0000" }, "message": "Merge \"Fix segmentation fault in aapt2\" into sc-dev" }, { "commit": "a1f1ba172bef819b992f0e4d00be9845f5b7127f", "tree": "2b05f2c7a45e757d2d0cd6171e4065db94a2fba5", "parents": [ "67976c83e23cc975b3dca5355bcc4bebd2a5a1f2", "2ec8e1b71fae1417e7d4df09600956b2c67a4936" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 11 20:27:56 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 11 20:27:56 2021 +0000" }, "message": "Merge \"Add \u003cstaging-public-group-final\u003e to aapt2 (2/2)\" into sc-dev" }, { "commit": "3965584d3a988e9a551ce0d96812f3923e01b0b5", "tree": "4baa42f33e58441d59a4f814f87ab356bcf98dcb", "parents": [ "b61fb4ee86c70ea34da9e0a05e4c65421a40dedf" ], "author": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Mon May 10 12:17:14 2021 -0400" }, "committer": { "name": "Kelvin Zhang", "email": "zhangkelvin@google.com", "time": "Tue May 11 17:18:45 2021 +0000" }, "message": "Fix segmentation fault in aapt2\n\nWhen passing a single iterator to std::vector::eraase, only element at\nthat iterator is removed. If no elements are filtered, std::remove_if()\nreturns the end iterator, attempting to erase() the end iterator can\ncause segmentation fault. This bug causes signing test to fail.\nhttps://atp.googleplex.com/tests/asit/ota/signing?tabId\u003dtest_run\n\nTest: aapt2\nPRODUCT/app/CalculatorGooglePrebuilt/CalculatorGooglePrebuilt.apk\n\nBug: 175789289\nBug: 178554651\n\nChange-Id: I813055238bef2dcbdf76172a00b3f44ae940b759\n(cherry picked from commit b88ccf80aa884df039cd13c5a31f3e08065d487e)\n" }, { "commit": "3266b6970cc441b091e02dcc63b74eec3025f9b1", "tree": "7914629f94702ce87f542f5fb6167cbfb54a718b", "parents": [ "b04efdff7045dfe585b7dbc9571dd95b0e35f204", "957168e2b2e90aae4c1846989e87d49fc4e7df3e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 11 16:48:45 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 11 16:48:45 2021 +0000" }, "message": "Merge \"Fix aapt badging segmentation fault\" into sc-dev" }, { "commit": "2ec8e1b71fae1417e7d4df09600956b2c67a4936", "tree": "935f3e7a3f40679fa0e6650866a8d24bd7eb85f4", "parents": [ "2fedba9a32d9e92344eaf6e9faf5b43e1bc2ae70" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Tue May 11 08:28:00 2021 -0700" }, "committer": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Tue May 11 08:28:00 2021 -0700" }, "message": "Add \u003cstaging-public-group-final\u003e to aapt2 (2/2)\n\nFixes BinaryResourceParser loading of alias chunk and makes changes\nthat did not get committed in 2fedba9a32d9e92344eaf6e9faf5b43e1bc2ae70.\n\nBug: 183411356\nTest: aapt2_test\nChange-Id: Ieff9166100019f38ddcfe900014709b15db24e43\n" }, { "commit": "2fedba9a32d9e92344eaf6e9faf5b43e1bc2ae70", "tree": "8d1e8882141341965e05c435230a3b6f0f3b15da", "parents": [ "969f4ec61b7f6d069726ffcc795d438af7d47f7d" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Fri Apr 23 07:47:38 2021 -0700" }, "committer": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Mon May 10 17:22:33 2021 -0700" }, "message": "Add \u003cstaging-public-group-final\u003e to aapt2\n\nTo allow apps that compiled against a pre-release SDK to continue\nworking for a period of time after API finalization, a new tag,\n\u003cstaging-public-group-final\u003e, has been added to aapt2.\n\nWhen finalizing the framework resource API, converting\n\u003cstaging-public-group\u003e tags to \u003cstaging-public-group-final\u003e will\ncause aapt2 to generate the resource table so that there is a resource\nentry for the old non-finalized (staged) resource ID and another entry\nfor the finalized resource ID of newly finalized resources. This allows\nan application that compiled against the pre-release SDK to continue\nresolving resources using pre-release resource IDs.\n\nAll references to pre-release resource IDs will be rewritten to their\nfinalized resource IDs through the information stored in the new staged\nalias chunk. This allows applications compiled against\n\u003cstaging-public-group\u003e resources to use the newly finalized\nresource ID without re-compilation.\n\nWhen an application is re-compiled against the SDK with\n\u003cstaging-public-group-final\u003e tags, the application will use the\nfinalized resource IDs.\n\nThis change limits the use of the alias chunk to the framework for S.\n\nBug: 183411356\nTest: aapt2_test\nChange-Id: Iba1c3033c3c2f32de8e4a19b58d3921c971092c4\n" }, { "commit": "957168e2b2e90aae4c1846989e87d49fc4e7df3e", "tree": "c43252531d904de0ba050b67c6c28a45b46cbaaf", "parents": [ "969f4ec61b7f6d069726ffcc795d438af7d47f7d" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Mon May 10 11:46:49 2021 -0700" }, "committer": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Mon May 10 11:46:49 2021 -0700" }, "message": "Fix aapt badging segmentation fault\n\nUnsigned subtraction lead to arithmetic overflow which caused aapt\nto reference the vector out of its bounds.\n\nBug: 175789289\nTest: dump badging on a manifest with no uses-sdk tag\nChange-Id: Id1b96376a8bfe13c0c195bb6f62b681c3d686034\n" }, { "commit": "b8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911", "tree": "9c0dafc4fee3f99c7236788cd46bb9eb1f366151", "parents": [ "b9680bac79d94fb10252fde5aa527e34c6d6e17e" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed May 05 12:43:01 2021 -0700" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Fri May 07 23:00:23 2021 +0000" }, "message": "Fix incompatibilities with Kotlin 1.5.0\n\nTest: make\nChange-Id: I9bc49c759d0b2527b6419f5d711e394402a7e781\n" }, { "commit": "7b526955cd52769de9b9cb010150b10372500b4b", "tree": "6b375f39c2ba966d0ba30a3b02b0409d9ca98f79", "parents": [ "47f282905e60c150bc3d381b4715d6ea2b25dfa9", "2e9e792e6e97038adbcd9d07c8ada290325f67c5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 07 20:00:38 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 07 20:00:38 2021 +0000" }, "message": "Merge \"Update fontchain_linter.py to be compatible with Compat font\" into sc-dev" }, { "commit": "2e9e792e6e97038adbcd9d07c8ada290325f67c5", "tree": "415118296346e97132d6392b818dde492978c5fe", "parents": [ "0e4d7f142b781bb6721c574592ba62a062bad183" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Tue May 04 17:12:35 2021 -0700" }, "committer": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Tue May 04 17:12:35 2021 -0700" }, "message": "Update fontchain_linter.py to be compatible with Compat font\n\nBug: 186700756\nTest: m fontchain_lint\nChange-Id: Ibfe33f29f3db998fdc0db1bbf35851841ca73d9a\n" } ], "next": "ea15d442b28f74e42b9f6f30e2fcfd8042e6d6b1" }