)]}' { "log": [ { "commit": "ee10757f1e04d658f3c37634818b98087533aa74", "tree": "d61e5539ae44346def3270a4f6b874d557804316", "parents": [ "c908510d393eb7b94c0df4345dc0d4572a7b4720", "b1263f0593597f0c29dc1245d5c691fd53a1db80" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Jan 08 01:56:09 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 08 01:56:09 2025 -0800" }, "message": "Merge \"Explicitly keep default constructor in rules without members\" into main am: b1263f0593\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/3438601\n\nChange-Id: I4e2cba50c3d510323751968d2eea58758062ac96\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b1263f0593597f0c29dc1245d5c691fd53a1db80", "tree": "d61e5539ae44346def3270a4f6b874d557804316", "parents": [ "685ccefefb207fad439beca0b9144e61e944579f", "d4dfd483c777aa1cbebf102bb22c40a690cc5f48" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Jan 08 01:26:45 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 08 01:26:45 2025 -0800" }, "message": "Merge \"Explicitly keep default constructor in rules without members\" into main" }, { "commit": "d4dfd483c777aa1cbebf102bb22c40a690cc5f48", "tree": "d61e5539ae44346def3270a4f6b874d557804316", "parents": [ "685ccefefb207fad439beca0b9144e61e944579f" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Mon Jan 06 13:00:20 2025 +0100" }, "committer": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Jan 08 00:05:57 2025 -0800" }, "message": "Explicitly keep default constructor in rules without members\n\nR8 implicitly keeps the default constructor when no member rules are specified. Future versions of R8 will require apps to explicitly keep the default constructors that are required for the build to work.\n\nThis conservatively changes all keep rules that currently keep the default constructor to explicitly keep the default constructor.\n\nFuture work will attempt to tighten up the rules that do not require the default constructor to be kept.\n\nBug: 373579455\nTest: existing\nChange-Id: I47cfe0c0e979bedcd50693dfddf76725be62032f\n" }, { "commit": "c908510d393eb7b94c0df4345dc0d4572a7b4720", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "ea63e6b7090b1d1576507c91474c682baf829b3c", "d0f572c176b75c3950a13aa0133ed9c4ae961558" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:44 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:44 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: I797ad2d7c7804b0b39fe32e0b1724f488a25a059\nChange-Id: I701d2c602851f36a61e3026ed7bbfb9e5e4964de\n" }, { "commit": "ea63e6b7090b1d1576507c91474c682baf829b3c", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "25a048d6019f6fd3d9850404face0975b9b1a417", "685ccefefb207fad439beca0b9144e61e944579f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:16:32 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:16:32 2024 -0800" }, "message": "[automerger skipped] Merge \"Merge 24Q4 into AOSP main\" into main am: 685ccefefb -s ours\n\nam skip reason: Merged-In I9d2505965fdf343468a3eefe228d7e93b13f914b with SHA-1 f5392cca12 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/3413349\n\nChange-Id: I623059cf685af24bbced6ea2e5a39a2ca3a59a20\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "25a048d6019f6fd3d9850404face0975b9b1a417", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "11ba6e3473a2a2cdf1ef236b2b35805e1a154089", "e43d1260417c54f8131a8edc054eb74b9bebad8d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:16:28 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:16:28 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: e43d126041 -s ours\n\nam skip reason: Merged-In I9d2505965fdf343468a3eefe228d7e93b13f914b with SHA-1 f5392cca12 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/3413349\n\nChange-Id: Ifa2b49908cfb810058ced99f6ae89263a70c2e81\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "685ccefefb207fad439beca0b9144e61e944579f", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "841d5199e1d1c64e7853fd953eed5247780908c1", "e43d1260417c54f8131a8edc054eb74b9bebad8d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 16:56:39 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 13 16:56:39 2024 -0800" }, "message": "Merge \"Merge 24Q4 into AOSP main\" into main" }, { "commit": "e43d1260417c54f8131a8edc054eb74b9bebad8d", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "841d5199e1d1c64e7853fd953eed5247780908c1", "11ba6e3473a2a2cdf1ef236b2b35805e1a154089" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:20 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:20 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I9d2505965fdf343468a3eefe228d7e93b13f914b\nChange-Id: Iaac661474b9dd684169eacbf5ec64f0bcfd78ec0\n" }, { "commit": "d0f572c176b75c3950a13aa0133ed9c4ae961558", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "f5392cca1216ed7953aa4796e80c703f1b4260ee", "11ba6e3473a2a2cdf1ef236b2b35805e1a154089" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 14 02:46:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 14 02:46:28 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 11ba6e3473 -s ours\n\nam skip reason: Merged-In I9d2505965fdf343468a3eefe228d7e93b13f914b with SHA-1 f5392cca12 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/30283924\n\nChange-Id: Ieee931c682aed542768b77fe5f159b7235eba4d8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "11ba6e3473a2a2cdf1ef236b2b35805e1a154089", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "841d5199e1d1c64e7853fd953eed5247780908c1", "f5392cca1216ed7953aa4796e80c703f1b4260ee" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:31 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:31 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: I9d2505965fdf343468a3eefe228d7e93b13f914b\nChange-Id: I6afaa4314b8da70c579eae3d86a575f42d4b4b7e\n" }, { "commit": "f5392cca1216ed7953aa4796e80c703f1b4260ee", "tree": "58c3a83dc33ada958ecd716bcc18e79a62a6971e", "parents": [ "841d5199e1d1c64e7853fd953eed5247780908c1" ], "author": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Fri Jul 26 20:08:47 2024 -0700" }, "committer": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Fri Jul 26 20:23:38 2024 -0700" }, "message": "Mark DefaultActivity in Provision direct boot aware\n\nIt can\u0027t be a setup wizard without being direct boot aware. It doesn\u0027t\nstore any state so it is also safe to do so.\n\nThis bug reveals possibilities where HOME role is different from the\nchosen HOME activity, but it is out of the scope of this CL to fix that.\n\nBug: 355664417\nTest: PMS chooses it as the first HOME activity, which matches the\nselection of HOME role.\nTest: Clank shows \"Add to Home screen\" with Provision as the OOBE\npackage.\nFlag: EXEMPT bug fix\n\nChange-Id: I9d2505965fdf343468a3eefe228d7e93b13f914b\n" }, { "commit": "841d5199e1d1c64e7853fd953eed5247780908c1", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "339c2bcb44fac64eec4d99eed84420fa0ea77127", "8d802ac3b077b6f19e428e0ccbd3e37de3e35d7d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Feb 11 20:47:29 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 11 20:47:29 2022 +0000" }, "message": "[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6b9dd4844f -s ours am: 8d802ac3b0 -s ours\n\nam skip reason: Merged-In Id5ff6f04666b7a525e1e2eaafccb19871969ad32 with SHA-1 331b5baece is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/16843720\n\nChange-Id: Ib51c053eaf95d63c6736fc28a9873b64ac115773\n" }, { "commit": "8d802ac3b077b6f19e428e0ccbd3e37de3e35d7d", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "fb66153721a209c985f96d01082ccb14de7b5665", "6b9dd4844f874024cf097aefba38928a1f485bb2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Feb 11 20:23:25 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 11 20:23:25 2022 +0000" }, "message": "[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6b9dd4844f -s ours\n\nam skip reason: Merged-In Id5ff6f04666b7a525e1e2eaafccb19871969ad32 with SHA-1 331b5baece is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/16843720\n\nChange-Id: I32f3d6aab73e8d07c898320b6bd188d58d0768d4\n" }, { "commit": "6b9dd4844f874024cf097aefba38928a1f485bb2", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "82c3bb4d3385c99070152b16ca7dd0818a0e2495", "7b1c6e35a43bc9073bf2ac18188c252324763be4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Feb 11 06:16:15 2022 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Feb 11 06:16:15 2022 +0000" }, "message": "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891\n\nBug: 214455710\nMerged-In: Id5ff6f04666b7a525e1e2eaafccb19871969ad32\nChange-Id: Ia0e64c1b09c2a4715dd1abbd2f616d952a4aaa2e\n" }, { "commit": "339c2bcb44fac64eec4d99eed84420fa0ea77127", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "cd09083277b8efa6b5cea769df49c06f864f0172", "fb66153721a209c985f96d01082ccb14de7b5665" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 28 17:00:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 28 17:00:38 2022 +0000" }, "message": "Merge \"Fix license and license text.\" am: 07e3d4716c am: 82c3bb4d33 am: c9a2c622b4 am: fb66153721\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1964699\n\nChange-Id: I2a3e17b0d3ba77a75230f25b20489fcaa4bf005a\n" }, { "commit": "fb66153721a209c985f96d01082ccb14de7b5665", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "7b1c6e35a43bc9073bf2ac18188c252324763be4", "c9a2c622b41d40ef97a03bf104097c87ab50b4ca" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 28 16:43:47 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 28 16:43:47 2022 +0000" }, "message": "Merge \"Fix license and license text.\" am: 07e3d4716c am: 82c3bb4d33 am: c9a2c622b4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1964699\n\nChange-Id: Ief9e55c7ef38e0cc749c47294f05ab156aba83e7\n" }, { "commit": "c9a2c622b41d40ef97a03bf104097c87ab50b4ca", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "54e8b0c78f19c20628293719a47cc642be5a9795", "82c3bb4d3385c99070152b16ca7dd0818a0e2495" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 28 16:31:43 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 28 16:31:43 2022 +0000" }, "message": "Merge \"Fix license and license text.\" am: 07e3d4716c am: 82c3bb4d33\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1964699\n\nChange-Id: I5e1b33809d595ff9ee646e766d5c599596c92d0e\n" }, { "commit": "82c3bb4d3385c99070152b16ca7dd0818a0e2495", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "54e8b0c78f19c20628293719a47cc642be5a9795", "07e3d4716c19f67f01f293816912d1f48bf5cac6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 28 16:19:41 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 28 16:19:41 2022 +0000" }, "message": "Merge \"Fix license and license text.\" am: 07e3d4716c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1964699\n\nChange-Id: Ia8b5c5e50d3dbdc7bee09110d474c3d7ba9ef841\n" }, { "commit": "07e3d4716c19f67f01f293816912d1f48bf5cac6", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "54e8b0c78f19c20628293719a47cc642be5a9795", "9a18210d951daed857f69c5c36f9940d1e313761" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 28 15:55:22 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 28 15:55:22 2022 +0000" }, "message": "Merge \"Fix license and license text.\"" }, { "commit": "9a18210d951daed857f69c5c36f9940d1e313761", "tree": "8236fd9b0b9af80c6821bb775caabec8b0d0a140", "parents": [ "54e8b0c78f19c20628293719a47cc642be5a9795" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Jan 27 20:11:56 2022 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Jan 27 20:11:56 2022 -0800" }, "message": "Fix license and license text.\n\nEntire project is 1p.\n\nTest: m nothing\nChange-Id: Id34c942397c14d4beed13ed3a9c4d13144a908b3\n" }, { "commit": "cd09083277b8efa6b5cea769df49c06f864f0172", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "0127bc9e08100a9a26238ae6b39d46c7ed29fbcc", "7b1c6e35a43bc9073bf2ac18188c252324763be4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 09:00:09 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 09:00:09 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: ee28c23464 -s ours am: d0c76d3e83 -s ours am: 73946c4b17 -s ours am: 54e8b0c78f -s ours am: 7b1c6e35a4 -s ours\n\nam skip reason: Merged-In Iccee4ffe208d24468016c890d7eb0119c0773045 with SHA-1 ed35f1a67d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1847538\n\nChange-Id: Ia9697f9ec84b2b74afe8cba8ab3172c84b5888be\n" }, { "commit": "7b1c6e35a43bc9073bf2ac18188c252324763be4", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "d56ab30b6bce04c9b420e357b75b9eb46b7b84e2", "54e8b0c78f19c20628293719a47cc642be5a9795" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 08:29:58 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 08:29:58 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: ee28c23464 -s ours am: d0c76d3e83 -s ours am: 73946c4b17 -s ours am: 54e8b0c78f -s ours\n\nam skip reason: Merged-In Iccee4ffe208d24468016c890d7eb0119c0773045 with SHA-1 ed35f1a67d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1847538\n\nChange-Id: I358de5dc22644e8912ead87d86d482cbf004df87\n" }, { "commit": "54e8b0c78f19c20628293719a47cc642be5a9795", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "826e528c6e95513f49679f59922741c1721e4c4f", "73946c4b17e369c12184b7793a875c838d4646c1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 07:57:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 07:57:01 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: ee28c23464 -s ours am: d0c76d3e83 -s ours am: 73946c4b17 -s ours\n\nam skip reason: Merged-In Iccee4ffe208d24468016c890d7eb0119c0773045 with SHA-1 ed35f1a67d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1847538\n\nChange-Id: Icf490b6ef529d5c5d2af2e66f134e4788c597dc1\n" }, { "commit": "73946c4b17e369c12184b7793a875c838d4646c1", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "613b139b18228caaf85f1f17715d9d80f8ba1e01", "d0c76d3e83729af51b0e73e2edae633339460e5b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 01:39:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 01:39:45 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: ee28c23464 -s ours am: d0c76d3e83 -s ours\n\nam skip reason: Merged-In Iccee4ffe208d24468016c890d7eb0119c0773045 with SHA-1 ed35f1a67d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1847538\n\nChange-Id: Id7e392e4b60cb0e333fa8fd98ec16e5f286b9ac0\n" }, { "commit": "d0c76d3e83729af51b0e73e2edae633339460e5b", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "ed35f1a67d41c5338d6688ef98e8d9533ec435b0", "ee28c23464a62c9b4d09a7c89ee3354ae928bbb9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 01:20:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 01:20:20 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: ee28c23464 -s ours\n\nam skip reason: Merged-In Iccee4ffe208d24468016c890d7eb0119c0773045 with SHA-1 ed35f1a67d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1847538\n\nChange-Id: If42517f2be9a1c405259cb96fdd3da1400a2a53a\n" }, { "commit": "ee28c23464a62c9b4d09a7c89ee3354ae928bbb9", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "9d30270ee55de6b93734e5d5ca12e19248d9c15e", "cf7d09499f395cac7bb52690db60aa8497f47cff" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 07 23:50:17 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 07 23:50:17 2021 +0000" }, "message": "Merge \"Merge Android 12\"" }, { "commit": "cf7d09499f395cac7bb52690db60aa8497f47cff", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "9d30270ee55de6b93734e5d5ca12e19248d9c15e", "ed35f1a67d41c5338d6688ef98e8d9533ec435b0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 06 22:53:57 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 06 22:53:57 2021 +0000" }, "message": "Merge Android 12\n\nBug: 202323961\nMerged-In: Iccee4ffe208d24468016c890d7eb0119c0773045\nChange-Id: I111fe941eab1e3415c48132916564772a150ff6c\n" }, { "commit": "0127bc9e08100a9a26238ae6b39d46c7ed29fbcc", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "462f0928191342ca5568ad2786510e64746cdb6e", "d56ab30b6bce04c9b420e357b75b9eb46b7b84e2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 18 00:24:08 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 18 00:24:08 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1a67d -s ours am: 613b139b18 -s ours am: 826e528c6e -s ours am: d56ab30b6b -s ours\n\nam skip reason: Merged-In I889df6bc8c2d4e97c43bbd83410b12d6c8becd25 with SHA-1 8af0d687f4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/15571653\n\nChange-Id: I6faeed4d5ccb27a0d9d7717f44380aa8176fb5fd\n" }, { "commit": "d56ab30b6bce04c9b420e357b75b9eb46b7b84e2", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "8af0d687f40aef1974aac86516114fe440262741", "826e528c6e95513f49679f59922741c1721e4c4f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 20:32:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 20:32:49 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1a67d -s ours am: 613b139b18 -s ours am: 826e528c6e -s ours\n\nam skip reason: Merged-In I889df6bc8c2d4e97c43bbd83410b12d6c8becd25 with SHA-1 8af0d687f4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/15571653\n\nChange-Id: I3fb6741914f6a5f6ac7d5f6016347305c80bc963\n" }, { "commit": "826e528c6e95513f49679f59922741c1721e4c4f", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "8af0d687f40aef1974aac86516114fe440262741", "613b139b18228caaf85f1f17715d9d80f8ba1e01" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 19:46:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 19:46:45 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1a67d -s ours am: 613b139b18 -s ours\n\nam skip reason: Merged-In I889df6bc8c2d4e97c43bbd83410b12d6c8becd25 with SHA-1 8af0d687f4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/15571653\n\nChange-Id: Iaa75092f6594ed2986faa51e688f38ea302a1716\n" }, { "commit": "613b139b18228caaf85f1f17715d9d80f8ba1e01", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "8af0d687f40aef1974aac86516114fe440262741", "ed35f1a67d41c5338d6688ef98e8d9533ec435b0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 18:36:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 18:36:14 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1a67d -s ours\n\nam skip reason: Merged-In I889df6bc8c2d4e97c43bbd83410b12d6c8becd25 with SHA-1 8af0d687f4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Provision/+/15571653\n\nChange-Id: I2bd887393e752e54c1d45d4db2d35c34e166c804\n" }, { "commit": "ed35f1a67d41c5338d6688ef98e8d9533ec435b0", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "9d30270ee55de6b93734e5d5ca12e19248d9c15e", "8af0d687f40aef1974aac86516114fe440262741" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Aug 14 06:30:56 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Aug 14 06:30:56 2021 +0000" }, "message": "Merge sc-dev-plus-aosp-without-vendor@7634622\n\nMerged-In: I889df6bc8c2d4e97c43bbd83410b12d6c8becd25\nChange-Id: Iccee4ffe208d24468016c890d7eb0119c0773045\n" }, { "commit": "462f0928191342ca5568ad2786510e64746cdb6e", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "23356226d971a60ebf8d56ac03abe453a045b5cf", "8af0d687f40aef1974aac86516114fe440262741" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Feb 20 18:07:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 18:07:48 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision\" am: 2353804c54 am: 9d30270ee5 am: 284880f1df am: 8af0d687f4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1588042\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I773b284b2ce3a3511dce6ea1c6815c4b81f9cff9\n" }, { "commit": "8af0d687f40aef1974aac86516114fe440262741", "tree": "103d774520d2f59781636ae3a6e490b9727d8bd8", "parents": [ "23356226d971a60ebf8d56ac03abe453a045b5cf", "284880f1df612c218fa890394fb2f50ba46f3cdb" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Feb 20 17:23:08 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 17:23:08 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision\" am: 2353804c54 am: 9d30270ee5 am: 284880f1df\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1588042\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I889df6bc8c2d4e97c43bbd83410b12d6c8becd25\n" }, { "commit": "284880f1df612c218fa890394fb2f50ba46f3cdb", "tree": "bd9f0948415b6bb87d1bdbe2a1d26f50371f925e", "parents": [ "bbe8a9f5ad141efd99a29395a82c9d0da7d00c2e", "9d30270ee55de6b93734e5d5ca12e19248d9c15e" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 19 02:25:35 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 19 02:25:35 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision\" am: 2353804c54 am: 9d30270ee5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1588042\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I413c3182043589b583de013a03352e8f895c9d66\n" }, { "commit": "9d30270ee55de6b93734e5d5ca12e19248d9c15e", "tree": "bd9f0948415b6bb87d1bdbe2a1d26f50371f925e", "parents": [ "bbe8a9f5ad141efd99a29395a82c9d0da7d00c2e", "2353804c54047bae47c28af2ee8be31ae5191e07" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 19 00:58:51 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 19 00:58:51 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision\" am: 2353804c54\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Provision/+/1588042\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I687267df583fe284eb689e3f96435979130b1f2a\n" }, { "commit": "2353804c54047bae47c28af2ee8be31ae5191e07", "tree": "bd9f0948415b6bb87d1bdbe2a1d26f50371f925e", "parents": [ "bbe8a9f5ad141efd99a29395a82c9d0da7d00c2e", "331b5baece77c7bc1122d8f159710a7260a89780" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Feb 18 23:43:49 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 18 23:43:49 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision\"" }, { "commit": "331b5baece77c7bc1122d8f159710a7260a89780", "tree": "bd9f0948415b6bb87d1bdbe2a1d26f50371f925e", "parents": [ "bbe8a9f5ad141efd99a29395a82c9d0da7d00c2e" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 14:32:07 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 14:32:07 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Provision\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: Id5ff6f04666b7a525e1e2eaafccb19871969ad32\n" }, { "commit": "23356226d971a60ebf8d56ac03abe453a045b5cf", "tree": "61746623e5a225c4dd8bf862d368fd16688c7fae", "parents": [ "a2953580122c549e6108fd7e2f911cde1fb2e7d2" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Tue Nov 17 16:11:03 2020 -0800" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Nov 23 11:54:26 2020 -0800" }, "message": "Changed Provision app so it can trigger device owner provisioning\n\nThe Provision app is a setup wizard that by default just set the\nprovisioning Settings, but with this change its behavior can be\nchanged to trigger Device Owner provisioning.\n\nFor example, to provision Device Owner using the TestDPC app, run the\nsteps below after first boot:\n\n adb root\n adb install PATH_TO_TESTDPC_APK\n adb shell settings put secure tmp_provision_set_do 1\n adb shell settings put secure tmp_provision_package com.afwsamples.testdpc\n adb shell settings put secure tmp_provision_receiver com.afwsamples.testdpc.DeviceAdminReceiver\n adb shell settings put secure tmp_provision_trigger 2\n adb shell rm /data/system/device_policies.xml\n adb shell settings put global device_provisioned 0\n adb shell settings put secure user_setup_complete 0\n adb shell pm enable com.android.provision\n adb shell pm enable com.android.provision/.DefaultActivity\n adb shell stop \u0026\u0026 adb shell start\n\nTest: manual verification (see above)\nBug: 170333009\n\nChange-Id: I248b4816a3767d9ff742b391ecea1d83a09b7613\n" }, { "commit": "a2953580122c549e6108fd7e2f911cde1fb2e7d2", "tree": "0ce582ac83a623276f87ad54a439be89b803e412", "parents": [ "1f623dad868a9b3a1e87b209c009f054400a0925", "bbe8a9f5ad141efd99a29395a82c9d0da7d00c2e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 20 19:45:18 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 19:45:18 2020 +0000" }, "message": "Merge \"Add an exported flag in manifest\" am: 4a3dd98a05 am: b4bc0db4fc am: e939b21a33 am: e5ef7e93dd am: bbe8a9f5ad\n\nChange-Id: I5d9dfeda7ac7838c412bfe8dd5b14331becc0932\n" }, { "commit": "bbe8a9f5ad141efd99a29395a82c9d0da7d00c2e", "tree": "0ce582ac83a623276f87ad54a439be89b803e412", "parents": [ "ad68780f7232642230e9fb26f07e5bd289fb37ce", "e5ef7e93ddcfba6d501699c896f5dfe0070230ff" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 20 19:33:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 19:33:00 2020 +0000" }, "message": "Merge \"Add an exported flag in manifest\" am: 4a3dd98a05 am: b4bc0db4fc am: e939b21a33 am: e5ef7e93dd\n\nChange-Id: Ib351be99523d1ca0c119ad3a2fdc18926ee87570\n" }, { "commit": "e5ef7e93ddcfba6d501699c896f5dfe0070230ff", "tree": "0ce582ac83a623276f87ad54a439be89b803e412", "parents": [ "0679e15672fc1550282d0ee1f2c45fc1ff0b65e9", "e939b21a33d6f512890fc90ba8bd8fe4b83ef766" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 20 19:20:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 19:20:56 2020 +0000" }, "message": "Merge \"Add an exported flag in manifest\" am: 4a3dd98a05 am: b4bc0db4fc am: e939b21a33\n\nChange-Id: Ic169196992b2f9900501da2e8be68160ca5ae778\n" }, { "commit": "e939b21a33d6f512890fc90ba8bd8fe4b83ef766", "tree": "0ce582ac83a623276f87ad54a439be89b803e412", "parents": [ "967470bac95c2aa7f94a360677821a7ad9dd65f7", "b4bc0db4fc6e08a7640c5071525b15e8b15414f0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 20 19:00:09 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 19:00:09 2020 +0000" }, "message": "Merge \"Add an exported flag in manifest\" am: 4a3dd98a05 am: b4bc0db4fc\n\nChange-Id: Id442cf36f20283cb0cb28c52800c88c72fc67fa3\n" }, { "commit": "b4bc0db4fc6e08a7640c5071525b15e8b15414f0", "tree": "0ce582ac83a623276f87ad54a439be89b803e412", "parents": [ "1af4b57ad0ab92fc3dce0d59482ff88ae680e1a6", "4a3dd98a0530a07c2e3b95d91c07cb98a23fb458" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 20 18:48:43 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 18:48:43 2020 +0000" }, "message": "Merge \"Add an exported flag in manifest\" am: 4a3dd98a05\n\nChange-Id: I4741f943493d1cfde469bcf60f1677736f8d5000\n" }, { "commit": "4a3dd98a0530a07c2e3b95d91c07cb98a23fb458", "tree": "0ce582ac83a623276f87ad54a439be89b803e412", "parents": [ "02e5ae4843125bdbd19e16de7ef36594676ec602", "a79dc45e586033a0f1e02e244eaea99f4a121885" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 20 18:34:41 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed May 20 18:34:41 2020 +0000" }, "message": "Merge \"Add an exported flag in manifest\"" }, { "commit": "1f623dad868a9b3a1e87b209c009f054400a0925", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "07f000ddaf314a5f1e204b5ae7ee42731893c9be", "ad68780f7232642230e9fb26f07e5bd289fb37ce" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 21:44:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 28 21:44:28 2020 +0000" }, "message": "Merge \"Remove MODULE_LICENSE_APACHE2 from apps/Provision\" am: 02e5ae4843 am: 1af4b57ad0 am: 967470bac9 am: 0679e15672 am: ad68780f72\n\nChange-Id: I9b9f92f45e6767979c6ff5de483f549c57fbf490\n" }, { "commit": "ad68780f7232642230e9fb26f07e5bd289fb37ce", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "863d9bb5c98c945ddf204e5e4126dff877eb60e8", "0679e15672fc1550282d0ee1f2c45fc1ff0b65e9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 21:32:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 28 21:32:49 2020 +0000" }, "message": "Merge \"Remove MODULE_LICENSE_APACHE2 from apps/Provision\" am: 02e5ae4843 am: 1af4b57ad0 am: 967470bac9 am: 0679e15672\n\nChange-Id: I28f25775d1f69eec81b32e6c92379ac167aa4cc2\n" }, { "commit": "0679e15672fc1550282d0ee1f2c45fc1ff0b65e9", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "9b2cb81d71ff1f3fc60802debf2c19af38907f4e", "967470bac95c2aa7f94a360677821a7ad9dd65f7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 21:20:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 28 21:20:23 2020 +0000" }, "message": "Merge \"Remove MODULE_LICENSE_APACHE2 from apps/Provision\" am: 02e5ae4843 am: 1af4b57ad0 am: 967470bac9\n\nChange-Id: I2b854b69dc76d2cb5e88cd8c72d91737fad14204\n" }, { "commit": "967470bac95c2aa7f94a360677821a7ad9dd65f7", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "c8f5f4a14003f7a6f7a7eedd6c7c4f5e46f34e11", "1af4b57ad0ab92fc3dce0d59482ff88ae680e1a6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 20:52:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 28 20:52:57 2020 +0000" }, "message": "Merge \"Remove MODULE_LICENSE_APACHE2 from apps/Provision\" am: 02e5ae4843 am: 1af4b57ad0\n\nChange-Id: I83547ac8a01d1f71f209d54afbc2df24711022be\n" }, { "commit": "1af4b57ad0ab92fc3dce0d59482ff88ae680e1a6", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "d411620d77dc573913c0c133b31c434dc38ac153", "02e5ae4843125bdbd19e16de7ef36594676ec602" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 20:39:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 28 20:39:33 2020 +0000" }, "message": "Merge \"Remove MODULE_LICENSE_APACHE2 from apps/Provision\" am: 02e5ae4843\n\nChange-Id: Ib17799c272e2e73a9f66afcfdcc9c7825395ddc8\n" }, { "commit": "02e5ae4843125bdbd19e16de7ef36594676ec602", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "7623fb5bc7c81b6b1f4d0ac498a256b31ca3988a", "300c9ddd5e5c4fb43c4cc8ab608cf1ab6f450882" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 28 20:26:42 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 28 20:26:42 2020 +0000" }, "message": "Merge \"Remove MODULE_LICENSE_APACHE2 from apps/Provision\"" }, { "commit": "300c9ddd5e5c4fb43c4cc8ab608cf1ab6f450882", "tree": "7013b4561796f910792530b166cc10ee837c41ea", "parents": [ "7623fb5bc7c81b6b1f4d0ac498a256b31ca3988a" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 20:28:14 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Apr 27 20:28:14 2020 -0700" }, "message": "Remove MODULE_LICENSE_APACHE2 from apps/Provision\n\nRepositories containing third-party code need a METADATA and a\nlicense_type. Repositories containing only first-party code no longer\nneed a MODULE_LICENSE_* file.\n\nBug: 68860345\nBug: 69058154\nBug: 151953481\n\nTest: no code changes\nChange-Id: If2b4c92b68b9144e8899ef52a574ea898fbf6a23\n" }, { "commit": "07f000ddaf314a5f1e204b5ae7ee42731893c9be", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "85fe6717d4936d68ca098c279874758b6b7fd3c3", "863d9bb5c98c945ddf204e5e4126dff877eb60e8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 04:29:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 04:29:56 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d411620d77 -s ours am: c8f5f4a140 am: 9b2cb81d71 am: 863d9bb5c9 -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: I6dea159f0bdfb001186a64553c695ff0b7bfd9a4\n" }, { "commit": "863d9bb5c98c945ddf204e5e4126dff877eb60e8", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "775d590ef60f336053b48c94db94a2672c198b7f", "9b2cb81d71ff1f3fc60802debf2c19af38907f4e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 04:05:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 04:05:34 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d411620d77 -s ours am: c8f5f4a140 am: 9b2cb81d71\n\nChange-Id: I0c3d450e9f8e2c0559767a8a34c528212f355309\n" }, { "commit": "9b2cb81d71ff1f3fc60802debf2c19af38907f4e", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "4d5d84d8e42c1952a8f35e8acc82303f4313c59d", "c8f5f4a14003f7a6f7a7eedd6c7c4f5e46f34e11" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 03:39:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 03:39:17 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d411620d77 -s ours am: c8f5f4a140\n\nChange-Id: Id5f119d5a9dcc9e0f3ad9921c0a9387cffbd69fe\n" }, { "commit": "c8f5f4a14003f7a6f7a7eedd6c7c4f5e46f34e11", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "44e642e59e09225b7a4b829c69f686b4fd204c38", "d411620d77dc573913c0c133b31c434dc38ac153" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 10 03:06:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 10 03:06:13 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d411620d77 -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: I7eb4fd43fda7206a4342794a02fbbc5fcc28c00c\n" }, { "commit": "d411620d77dc573913c0c133b31c434dc38ac153", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "dc9d78a488527907b3e62f97e7585ae4ec29cc55", "30b9be7b45c18a7b3c9f008da36d5b73ef2954c2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Apr 09 17:51:17 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Apr 09 17:51:17 2020 -0700" }, "message": "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master\n\nBug: 151763422\nChange-Id: I8af15f039bbf08a2d60ef5f4af805efdb6a536a6\n" }, { "commit": "a79dc45e586033a0f1e02e244eaea99f4a121885", "tree": "16ea4589ecd243fae0360f880b08b73772189d04", "parents": [ "7623fb5bc7c81b6b1f4d0ac498a256b31ca3988a" ], "author": { "name": "Ashwini Oruganti", "email": "ashfall@google.com", "time": "Mon Mar 23 15:43:05 2020 -0700" }, "committer": { "name": "Ashwini Oruganti", "email": "ashfall@google.com", "time": "Mon Mar 23 15:43:05 2020 -0700" }, "message": "Add an exported flag in manifest\n\nWith b/150232615, we will need an explicit value set for the exported\nflag when intent filters are present, as the default behavior is\nchanging for S+. This change adds the value reflecting the previous\ndefault to the manifest.\n\nThese changes were made using an automated tool, the xml file may be\nreformatted slightly creating a larger diff. The only \"real\" change is\nthe addition of \"android:exported\" to activities, services, and\nreceivers that have one or more intent-filters.\n\nBug: 150232615\nTest: TH\nExempt-From-Owner-Approval: mechanical refactoring\nChange-Id: I5f53e5c95a70acf7212b48e8d8a9d51b3fffbcdf\n" }, { "commit": "85fe6717d4936d68ca098c279874758b6b7fd3c3", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "a169fa4647c818fbebe1a24ebbc18ec746133adb", "775d590ef60f336053b48c94db94a2672c198b7f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 19 08:48:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 08:48:54 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dc9d78a488 -s ours am: 44e642e59e am: 4d5d84d8e4 am: 775d590ef6 -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: I9eac85593bca13f26bde21f7184bcca52b6769b2\n" }, { "commit": "775d590ef60f336053b48c94db94a2672c198b7f", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "a169fa4647c818fbebe1a24ebbc18ec746133adb", "4d5d84d8e42c1952a8f35e8acc82303f4313c59d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 19 08:24:06 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 08:24:06 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dc9d78a488 -s ours am: 44e642e59e am: 4d5d84d8e4\n\nChange-Id: Ife1b3c57763a5e2f481a935c359d04da4600f42b\n" }, { "commit": "4d5d84d8e42c1952a8f35e8acc82303f4313c59d", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "a169fa4647c818fbebe1a24ebbc18ec746133adb", "44e642e59e09225b7a4b829c69f686b4fd204c38" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 19 08:06:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 08:06:40 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dc9d78a488 -s ours am: 44e642e59e\n\nChange-Id: Ib4e1453f4cb1526e0834af9bdbe5a39c1f654eb4\n" }, { "commit": "30b9be7b45c18a7b3c9f008da36d5b73ef2954c2", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "7de4d65df4991941adff0edb8b40a7dd50973f48", "dc9d78a488527907b3e62f97e7585ae4ec29cc55" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 19 07:46:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 07:46:56 2020 +0000" }, "message": "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dc9d78a488\n\nChange-Id: Ie60a5f7c749adef583267641d03953333bc25eea\n" }, { "commit": "44e642e59e09225b7a4b829c69f686b4fd204c38", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "a169fa4647c818fbebe1a24ebbc18ec746133adb", "dc9d78a488527907b3e62f97e7585ae4ec29cc55" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 19 07:46:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 07:46:44 2020 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dc9d78a488 -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: Ie3ffdedadbb2d0094ebaa2a5f933d71a45025133\n" }, { "commit": "dc9d78a488527907b3e62f97e7585ae4ec29cc55", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "7623fb5bc7c81b6b1f4d0ac498a256b31ca3988a", "7de4d65df4991941adff0edb8b40a7dd50973f48" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 18 19:40:50 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 18 19:40:50 2020 -0700" }, "message": "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master\n\nBug: 151763422\nChange-Id: I6e9b61947fab2ab1aefa03a4dcee2999c9a256e2\n" }, { "commit": "a169fa4647c818fbebe1a24ebbc18ec746133adb", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "a283865ebf4959e4584592f086fc2c09ded11342", "7de4d65df4991941adff0edb8b40a7dd50973f48" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:11:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:11:58 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge \"Move the app to /system_ext\" am: 24df85c79c\" into stage-aosp-master am: 7623fb5bc7 -s ours am: 7de4d65df4 -s ours\nam skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 961d5a14e0 is in history\n\nChange-Id: Iccde135acea5454d0251649f33150f6a0ad0a6b5\n" }, { "commit": "a283865ebf4959e4584592f086fc2c09ded11342", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "e00816416a6c7bd00c690006eab41bb7354d205a", "7949ddd4e3e962cf2acbb5368413da8608edbce3" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:11:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:11:27 2020 +0000" }, "message": "[automerger skipped] Merge \"Move the app to /system_ext\" am: 24df85c79c am: cb0eff8f88 -s ours am: 7949ddd4e3 -s ours\nam skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 961d5a14e0 is in history\n\nChange-Id: Id5874e2ad7ba0302781099e8c34a6cfe6eb462b8\n" }, { "commit": "e00816416a6c7bd00c690006eab41bb7354d205a", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "961d5a14e07db44f4f48f4a2e5788e55b2ecd9db", "98805c11af193adb981c8e9c2a86949fd2cfe3ad" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:04:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:04:00 2020 +0000" }, "message": "[automerger skipped] Merge \"Move the app to /system_ext\" am: 24df85c79c am: 87d6123923 am: 98805c11af -s ours\nam skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 961d5a14e0 is in history\n\nChange-Id: I54f2a148ee6421839b8aedbcbe5d609cb42500ab\n" }, { "commit": "7de4d65df4991941adff0edb8b40a7dd50973f48", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "7949ddd4e3e962cf2acbb5368413da8608edbce3", "7623fb5bc7c81b6b1f4d0ac498a256b31ca3988a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:00:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:00:49 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge \"Move the app to /system_ext\" am: 24df85c79c\" into stage-aosp-master am: 7623fb5bc7 -s ours\nam skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 969de8f943 is in history\n\nChange-Id: Ie7c2cd72aa326edfa0c3ebfbc207714a7bb65bb0\n" }, { "commit": "7949ddd4e3e962cf2acbb5368413da8608edbce3", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "98805c11af193adb981c8e9c2a86949fd2cfe3ad", "cb0eff8f88cffbff0ec3c0180233568323ce069a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 21:59:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 21:59:59 2020 +0000" }, "message": "[automerger skipped] Merge \"Move the app to /system_ext\" am: 24df85c79c am: cb0eff8f88 -s ours\nam skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 969de8f943 is in history\n\nChange-Id: If75c7690add3b52fbaf94f8329cb190ea9829dd4\n" }, { "commit": "98805c11af193adb981c8e9c2a86949fd2cfe3ad", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "d3aaf77c58a5886c113f88a99c6aa8f2b7873107", "87d612392304b4daced41c596fb972673ab66535" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 21:49:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 21:49:08 2020 +0000" }, "message": "Merge \"Move the app to /system_ext\" am: 24df85c79c am: 87d6123923\n\nChange-Id: Ic7c6a8760ad3944e3b765675a0284926cc770a07\n" }, { "commit": "7623fb5bc7c81b6b1f4d0ac498a256b31ca3988a", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "87d612392304b4daced41c596fb972673ab66535", "cb0eff8f88cffbff0ec3c0180233568323ce069a" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Jan 17 20:17:58 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 17 20:17:58 2020 +0000" }, "message": "Merge \"Merge \"Move the app to /system_ext\" am: 24df85c79c\" into stage-aosp-master" }, { "commit": "cb0eff8f88cffbff0ec3c0180233568323ce069a", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "d3aaf77c58a5886c113f88a99c6aa8f2b7873107", "24df85c79c7b058d67c4c36335816ebedb179911" ], "author": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Fri Jan 17 12:14:19 2020 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 17 12:14:19 2020 -0800" }, "message": "Merge \"Move the app to /system_ext\"\nam: 24df85c79c\n\nChange-Id: I8f031d06a063991f2e9d98fe5aadbf8692772a70\n" }, { "commit": "87d612392304b4daced41c596fb972673ab66535", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "d3aaf77c58a5886c113f88a99c6aa8f2b7873107", "24df85c79c7b058d67c4c36335816ebedb179911" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 20:13:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 20:13:15 2020 +0000" }, "message": "Merge \"Move the app to /system_ext\" am: 24df85c79c\n\nChange-Id: I45e686cd1f4fb7d015cfde13d6b193c1bce7ef83\n" }, { "commit": "24df85c79c7b058d67c4c36335816ebedb179911", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "d3aaf77c58a5886c113f88a99c6aa8f2b7873107", "969de8f9433222b370713eb28dc117a23667d662" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 17 11:44:42 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 17 11:44:42 2020 +0000" }, "message": "Merge \"Move the app to /system_ext\"" }, { "commit": "969de8f9433222b370713eb28dc117a23667d662", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "d3aaf77c58a5886c113f88a99c6aa8f2b7873107" ], "author": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Mon Nov 25 20:25:24 2019 +0900" }, "committer": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Fri Dec 27 16:34:06 2019 +0900" }, "message": "Move the app to /system_ext\n\nAs mentioned in go/partitions-in-r, we plan to forbid hidden API in\nproduct partition.\nSo this app should be moved to /system_ext because it uses hidden API.\nIt is not permanent, so they can be moved back to /product due to\nneeds if there isn\u0027t hidden usage anymore.\n\nBug: 137908189\nTest: m\nTest: check whether device boots successfully\nChange-Id: Ia727541b31d206d8106bfe66f6afb70d639224de\nMerged-In: Ia727541b31d206d8106bfe66f6afb70d639224de\n" }, { "commit": "961d5a14e07db44f4f48f4a2e5788e55b2ecd9db", "tree": "65cc81e1e42035988704642c4830a20042466cff", "parents": [ "d3aaf77c58a5886c113f88a99c6aa8f2b7873107" ], "author": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Mon Nov 25 20:25:24 2019 +0900" }, "committer": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Mon Nov 25 20:25:24 2019 +0900" }, "message": "Move the app to /system_ext\n\nAs mentioned in go/partitions-in-r, we plan to forbid hidden API in\nproduct partition.\nSo this app should be moved to /system_ext because it uses hidden API.\nIt is not permanent, so they can be moved back to /product due to\nneeds if there isn\u0027t hidden usage anymore.\n\nBug: 137908189\nTest: m\nTest: check whether device boots successfully\nChange-Id: Ia727541b31d206d8106bfe66f6afb70d639224de\n" }, { "commit": "d3aaf77c58a5886c113f88a99c6aa8f2b7873107", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "438ea03d2ff0c9be9672965d2283f8a71f46253d", "052ede55d1f786e2a05f44d8b644c2576298c5a2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Feb 24 02:29:28 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Feb 24 02:29:28 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\nam: 052ede55d1 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Id52833b4f87bbd5abbb71b773a59744c1e5dccb1\n" }, { "commit": "052ede55d1f786e2a05f44d8b644c2576298c5a2", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "1ca60a4c0dd51251b528291dac1d5f067dc024c6", "37e7439c66914a018a92fc64d80e5a12cb4928df" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:19:40 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:19:40 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: I59ed89b1f8b35f8805f21b6317b787d9bc058b14\n" }, { "commit": "438ea03d2ff0c9be9672965d2283f8a71f46253d", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "58426b59d5eccf4d2ac9c36d5a1569d0cc8d9556", "37e7439c66914a018a92fc64d80e5a12cb4928df" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Jan 15 06:20:18 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 15 06:20:18 2019 -0800" }, "message": "Merge \"Move Provision to /product\" am: e8ea6bff45 am: 1ca60a4c0d\nam: 37e7439c66\n\nChange-Id: I055c361c4e8c1febfd2c1f571aa72fad736bfce1\n" }, { "commit": "37e7439c66914a018a92fc64d80e5a12cb4928df", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "cb228be07017b413d2db27f25589bfd80a17dd1a", "1ca60a4c0dd51251b528291dac1d5f067dc024c6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Jan 15 06:07:11 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 15 06:07:11 2019 -0800" }, "message": "Merge \"Move Provision to /product\" am: e8ea6bff45\nam: 1ca60a4c0d\n\nChange-Id: I38110e6c0641035ac47c04fb716a9d63a3407b72\n" }, { "commit": "1ca60a4c0dd51251b528291dac1d5f067dc024c6", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "7a336bcdd66f5067f9616c8a6b45a400f34d7e2e", "e8ea6bff45a2aac27a9d79252621023d4d3a29fb" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Jan 15 05:47:42 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 15 05:47:42 2019 -0800" }, "message": "Merge \"Move Provision to /product\"\nam: e8ea6bff45\n\nChange-Id: I642a5c7ae46ce3d4c7660cb1253c65bfd7d1a162\n" }, { "commit": "e8ea6bff45a2aac27a9d79252621023d4d3a29fb", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "93068a3c584e2f6c39239b0cccb26330bf5e634e", "3278a8e2347712c472f541081552cae1964549bf" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Jan 15 13:23:15 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 15 13:23:15 2019 +0000" }, "message": "Merge \"Move Provision to /product\"" }, { "commit": "3278a8e2347712c472f541081552cae1964549bf", "tree": "6cdafaa3a88020d3ff57f55bd6823d31feef0bee", "parents": [ "93068a3c584e2f6c39239b0cccb26330bf5e634e" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Jan 11 15:02:27 2019 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Jan 15 10:09:25 2019 +0000" }, "message": "Move Provision to /product\n\nThis app is frequently overriden by proprietary apps\non shipping devices, so move it to /product.\n\nAlso make the app inherit its privapp permission grant.\n\nBug: 122353713\nTest: boot aosp_arm64 emulator\nChange-Id: Ia77d785f5fe738f05cb86c464d2bed9495debb24\n" }, { "commit": "58426b59d5eccf4d2ac9c36d5a1569d0cc8d9556", "tree": "49ce9a6eae715e520a49a8b92ad488385c708eb9", "parents": [ "f5f88a75d6d89c09c48786492791debcf7b3001a", "cb228be07017b413d2db27f25589bfd80a17dd1a" ], "author": { "name": "Sasha Smundak", "email": "asmundak@google.com", "time": "Fri Jan 11 19:50:19 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 11 19:50:19 2019 -0800" }, "message": "Merge \"Convert Android.mk file to Android.bp\" am: 93068a3c58 am: 7a336bcdd6\nam: cb228be070\n\nChange-Id: I636d7aa8e106e9a880752fae8bb4dde50f218b3e\n" }, { "commit": "cb228be07017b413d2db27f25589bfd80a17dd1a", "tree": "49ce9a6eae715e520a49a8b92ad488385c708eb9", "parents": [ "0617ba3bbb94b76e350f2ad7f9f96d35eea9f179", "7a336bcdd66f5067f9616c8a6b45a400f34d7e2e" ], "author": { "name": "Sasha Smundak", "email": "asmundak@google.com", "time": "Fri Jan 11 19:45:19 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 11 19:45:19 2019 -0800" }, "message": "Merge \"Convert Android.mk file to Android.bp\" am: 93068a3c58\nam: 7a336bcdd6\n\nChange-Id: If5e063787debf0361732489375b194b4c9a082a8\n" }, { "commit": "7a336bcdd66f5067f9616c8a6b45a400f34d7e2e", "tree": "49ce9a6eae715e520a49a8b92ad488385c708eb9", "parents": [ "d33ac74e445bae54e1652bc51895bcb10445605c", "93068a3c584e2f6c39239b0cccb26330bf5e634e" ], "author": { "name": "Sasha Smundak", "email": "asmundak@google.com", "time": "Fri Jan 11 19:41:18 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 11 19:41:18 2019 -0800" }, "message": "Merge \"Convert Android.mk file to Android.bp\"\nam: 93068a3c58\n\nChange-Id: I3daed02bce47025f8c8c36349f445cdae8d12122\n" }, { "commit": "93068a3c584e2f6c39239b0cccb26330bf5e634e", "tree": "49ce9a6eae715e520a49a8b92ad488385c708eb9", "parents": [ "327d858736d39c11bd609e1f30d9c121c227158e", "f591887310a2d82e8c0961372122cad74c556322" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jan 12 03:33:45 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Jan 12 03:33:45 2019 +0000" }, "message": "Merge \"Convert Android.mk file to Android.bp\"" }, { "commit": "f591887310a2d82e8c0961372122cad74c556322", "tree": "49ce9a6eae715e520a49a8b92ad488385c708eb9", "parents": [ "327d858736d39c11bd609e1f30d9c121c227158e" ], "author": { "name": "Sasha Smundak", "email": "asmundak@google.com", "time": "Fri Jan 11 15:47:26 2019 -0800" }, "committer": { "name": "Sasha Smundak", "email": "asmundak@google.com", "time": "Fri Jan 11 15:47:26 2019 -0800" }, "message": "Convert Android.mk file to Android.bp\n\nSee build/soong/README.md for more information.\n\nChange-Id: I5341be5201a83c83e5aa8a477e085aba34bb09f5\nFixes: 122332839\nTest: treehugger\n" }, { "commit": "f5f88a75d6d89c09c48786492791debcf7b3001a", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "41171be03f7a98e631cc6d5ecb97f38a23d31e7e", "0617ba3bbb94b76e350f2ad7f9f96d35eea9f179" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 10 12:57:16 2018 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 10 12:57:16 2018 -0800" }, "message": "[automerger skipped] Merge \"DO NOT MERGE\" am: 327d858736 -s ours am: d33ac74e44 -s ours\nam: 0617ba3bbb -s ours\n\nChange-Id: Ib14076648f605d38f565b888274e96c6c6a047c4\n" }, { "commit": "0617ba3bbb94b76e350f2ad7f9f96d35eea9f179", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "41171be03f7a98e631cc6d5ecb97f38a23d31e7e", "d33ac74e445bae54e1652bc51895bcb10445605c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 10 11:13:49 2018 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 10 11:13:49 2018 -0800" }, "message": "[automerger skipped] Merge \"DO NOT MERGE\" am: 327d858736 -s ours\nam: d33ac74e44 -s ours\n\nChange-Id: Ie94d3758dcfdce67af7cdf143a41acab1ca864f0\n" }, { "commit": "d33ac74e445bae54e1652bc51895bcb10445605c", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "41171be03f7a98e631cc6d5ecb97f38a23d31e7e", "327d858736d39c11bd609e1f30d9c121c227158e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 10 10:10:55 2018 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 10 10:10:55 2018 -0800" }, "message": "[automerger skipped] Merge \"DO NOT MERGE\"\nam: 327d858736 -s ours\n\nChange-Id: Iecf5ee2d88c95249ca6b151582eee5536b43c765\n" }, { "commit": "327d858736d39c11bd609e1f30d9c121c227158e", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "41171be03f7a98e631cc6d5ecb97f38a23d31e7e", "e310034f61ca71805a0cfd92de0a7caa4b7561e4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Dec 10 17:20:41 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 10 17:20:41 2018 +0000" }, "message": "Merge \"DO NOT MERGE\"" }, { "commit": "e310034f61ca71805a0cfd92de0a7caa4b7561e4", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "41171be03f7a98e631cc6d5ecb97f38a23d31e7e", "fb412f61067b791902c0313bca2d23e9697b0d8c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 07 16:14:49 2018 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 07 16:14:49 2018 -0800" }, "message": "DO NOT MERGE\n\nMerge pie-platform-release (PPRL.181205.001, history only) into master\n\nBug: 120502534\nChange-Id: I7019bc01dc64db2ee92cc9b89fc21137f73fb58a\n" }, { "commit": "fb412f61067b791902c0313bca2d23e9697b0d8c", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d", "41171be03f7a98e631cc6d5ecb97f38a23d31e7e" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sun Feb 25 08:23:46 2018 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sun Feb 25 08:23:46 2018 +0000" }, "message": "Snap for 4620899 from 41171be03f7a98e631cc6d5ecb97f38a23d31e7e to pi-release\n\nChange-Id: I3d49becf69132a07af1b1b18ddf77224951ebe1c\n" }, { "commit": "41171be03f7a98e631cc6d5ecb97f38a23d31e7e", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d", "de140d2dd6c67d8ceecdb92a2f2d41044bd6cb48" ], "author": { "name": "hansson", "email": "hansson@google.com", "time": "Thu Feb 22 19:03:26 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 22 19:03:26 2018 +0000" }, "message": "Merge \"packages/apps/Provision: Set LOCAL_SDK_VERSION where possible.\" am: 01fab1d3e4 am: 1df4c85042\nam: de140d2dd6\n\nChange-Id: Id2cf66ea8305a4a4606ed032b9976d972fba4763\n" }, { "commit": "de140d2dd6c67d8ceecdb92a2f2d41044bd6cb48", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d", "1df4c85042be00c81d97aded90adbc7c2320b776" ], "author": { "name": "hansson", "email": "hansson@google.com", "time": "Thu Feb 22 18:55:23 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 22 18:55:23 2018 +0000" }, "message": "Merge \"packages/apps/Provision: Set LOCAL_SDK_VERSION where possible.\" am: 01fab1d3e4\nam: 1df4c85042\n\nChange-Id: Iac69e77bec602763b511938b519ae5dead1d4421\n" }, { "commit": "1df4c85042be00c81d97aded90adbc7c2320b776", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d", "01fab1d3e4e3329a7c14614930f18dbd7889d19d" ], "author": { "name": "hansson", "email": "hansson@google.com", "time": "Thu Feb 22 18:46:58 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 22 18:46:58 2018 +0000" }, "message": "Merge \"packages/apps/Provision: Set LOCAL_SDK_VERSION where possible.\"\nam: 01fab1d3e4\n\nChange-Id: I6d11ec41935c0f8dfc16385573aa6de9d255e699\n" }, { "commit": "01fab1d3e4e3329a7c14614930f18dbd7889d19d", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d", "6c3b0db4f22eb7899c79929a3498b8db6a8b97c5" ], "author": { "name": "hansson", "email": "hansson@google.com", "time": "Thu Feb 22 18:28:49 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 22 18:28:49 2018 +0000" }, "message": "Merge \"packages/apps/Provision: Set LOCAL_SDK_VERSION where possible.\"" }, { "commit": "6c3b0db4f22eb7899c79929a3498b8db6a8b97c5", "tree": "23d861ce1d6048df89422bb1ccefb53f99242f62", "parents": [ "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Feb 22 16:12:24 2018 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Feb 22 16:12:24 2018 +0000" }, "message": "packages/apps/Provision: Set LOCAL_SDK_VERSION where possible.\n\nThis change sets LOCAL_SDK_VERSION for all packages where\nthis is possible without breaking the build, and\nLOCAL_PRIVATE_PLATFORM_APIS :\u003d true otherwise.\n\nSetting one of these two will be made required soon, and this\nis a change in preparation for that. Not setting LOCAL_SDK_VERSION\nmakes the app implicitly depend on the bootclasspath, which is\noften not required. This change effectively makes depending on\nprivate apis opt-in rather than opt-out.\n\nTest: make relevant packages\nBug: 73535841\nChange-Id: I8b06b88704fc61d7c0f8c47fb72bdb570e244e3c\n" }, { "commit": "6b2548213a9c7cf93ac9dc32f8b82db4ad8e9c4d", "tree": "62f731b4de9555f56b161872ed174c79e6b42e22", "parents": [ "40b4176f4df367410394cdaba7b6bc9db95af6ca", "077fc59dd26cdecdfe2ea3af614291b103faa7e2" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Fri May 13 21:17:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 21:17:30 2016 +0000" }, "message": "Merge \"Provision is the AOSP \\\u0027setup wizard\\\u0027 app... am: 356bff898c am: 53593db784\" into nyc-mr1-dev-plus-aosp\nam: 077fc59dd2\n\n* commit \u0027077fc59dd26cdecdfe2ea3af614291b103faa7e2\u0027:\n\nChange-Id: I88bcee92a5401477a2a1fb69a00f5f6720f16c60\n" } ], "next": "40b4176f4df367410394cdaba7b6bc9db95af6ca" }