)]}' { "log": [ { "commit": "68b3632330e7a9a4f9813b7eb671dbfd78c25bcd", "tree": "72e7c0ec8c23cb3baf395d16bfa18c8aa04e8cd9", "parents": [ "4bf51785174e8e538d11de4a462d6f4cb23e236e", "07f94882a510d6d1c53140e3f2644d103ac4d217" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 19 22:36:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 19 22:36:02 2024 +0000" }, "message": "[automerger skipped] Mark 24Q4 as merged in aosp-main-future am: 07f94882a5 -s ours\n\nam skip reason: Merged-In I3f0448082622ba3b29185c0a069f3db3c7a303b4 with SHA-1 4bf5178517 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/29933936\n\nChange-Id: Iae8ae1d84f117078253942d35c73524454b97aea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "07f94882a510d6d1c53140e3f2644d103ac4d217", "tree": "72e7c0ec8c23cb3baf395d16bfa18c8aa04e8cd9", "parents": [ "fedc9271abec340984555ddd7fb3bcc50f9014ed", "084c1fecaa10b96cb3a144c095c656c52c79dbe0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:36 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:36 2024 -0700" }, "message": "Mark 24Q4 as merged in aosp-main-future\n\nBug: 373937381\nMerged-In: I3f0448082622ba3b29185c0a069f3db3c7a303b4\nChange-Id: I7eee0ff34d820e7509e7c1269fa8dfbe142ea79a\n" }, { "commit": "4bf51785174e8e538d11de4a462d6f4cb23e236e", "tree": "72e7c0ec8c23cb3baf395d16bfa18c8aa04e8cd9", "parents": [ "084c1fecaa10b96cb3a144c095c656c52c79dbe0", "fedc9271abec340984555ddd7fb3bcc50f9014ed" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 22:39:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 22:39:20 2024 +0000" }, "message": "Merge \"Fix UnusedVariable errorprone issues\" into main am: fb2f68febc am: fedc9271ab\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3284245\n\nChange-Id: I3f0448082622ba3b29185c0a069f3db3c7a303b4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fedc9271abec340984555ddd7fb3bcc50f9014ed", "tree": "72e7c0ec8c23cb3baf395d16bfa18c8aa04e8cd9", "parents": [ "e5b39f43aa21772a6dac4397e651bee9fa1aaa24", "fb2f68febc8d50727787f1ed44a136ff81d1173c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 22:23:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 26 22:23:26 2024 +0000" }, "message": "Merge \"Fix UnusedVariable errorprone issues\" into main am: fb2f68febc\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3284245\n\nChange-Id: I3fd0193dbbce62c1d0dbf631df8fcb3fae88f3b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fb2f68febc8d50727787f1ed44a136ff81d1173c", "tree": "72e7c0ec8c23cb3baf395d16bfa18c8aa04e8cd9", "parents": [ "e5b39f43aa21772a6dac4397e651bee9fa1aaa24", "80d9e176e9d419592eeb22fb58042ce477b9c691" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 26 21:54:09 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 26 21:54:09 2024 +0000" }, "message": "Merge \"Fix UnusedVariable errorprone issues\" into main" }, { "commit": "80d9e176e9d419592eeb22fb58042ce477b9c691", "tree": "72e7c0ec8c23cb3baf395d16bfa18c8aa04e8cd9", "parents": [ "e5b39f43aa21772a6dac4397e651bee9fa1aaa24" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Sep 26 13:00:12 2024 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Sep 26 13:00:12 2024 -0700" }, "message": "Fix UnusedVariable errorprone issues\n\nhttps://errorprone.info/bugpattern/UnusedVariable\nhttps://errorprone.info/bugpattern/UnusedTypeParameter\nhttps://errorprone.info/bugpattern/UnusedNestedClass\nhttps://errorprone.info/bugpattern/UnusedMethod\nhttps://errorprone.info/bugpattern/UnusedLabel\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: I6cbeb8bdc065f29c4b0afa65351001dab135f970\n" }, { "commit": "084c1fecaa10b96cb3a144c095c656c52c79dbe0", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "c634572c3db2cff66c9d12aca67491f727e3c8e2", "e5b39f43aa21772a6dac4397e651bee9fa1aaa24" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 21:26:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 21:26:00 2024 +0000" }, "message": "[automerger skipped] Mark ab/11976889 as merged in aosp-main-future am: e5b39f43aa -s ours\n\nam skip reason: Merged-In Ie6fbd4378721e0ecb611d7a0590d7829b5a83cb1 with SHA-1 f904ab9140 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/27904537\n\nChange-Id: Iee824491bd98a349ffc2ae16e763bba2cacef115\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e5b39f43aa21772a6dac4397e651bee9fa1aaa24", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "f904ab9140b4a8682028cc4f23c626f4c9153c3c", "9744463aed6d4fed2a69403ae9b60c523d305976" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 11:43:39 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 11:43:39 2024 -0700" }, "message": "Mark ab/11976889 as merged in aosp-main-future\n\nBug: 347831320\nMerged-In: Ie6fbd4378721e0ecb611d7a0590d7829b5a83cb1\nChange-Id: Ibdcc4f692ea779b56eadc533d668c6fcfed9c0da\n" }, { "commit": "c634572c3db2cff66c9d12aca67491f727e3c8e2", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "0486711a676fec71efdab928c5193340f90f3bf6", "f904ab9140b4a8682028cc4f23c626f4c9153c3c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:57:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:57:48 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR3 to AOSP main\" into main am: 5a3571811c -s ours am: f904ab9140 -s ours\n\nam skip reason: Merged-In I22167c7b3de40d816584db6053d0bf1b19d26d46 with SHA-1 020035a856 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3131841\n\nChange-Id: Iac4bf672546cdeadec723e7ac64cf065542e085e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0486711a676fec71efdab928c5193340f90f3bf6", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "9744463aed6d4fed2a69403ae9b60c523d305976", "d10d6b7234e5957afbe8dce6a60fc8c73be7ac9b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:55:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:55:57 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 35d1e92868 -s ours am: d10d6b7234 -s ours\n\nam skip reason: Merged-In I22167c7b3de40d816584db6053d0bf1b19d26d46 with SHA-1 020035a856 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3131841\n\nChange-Id: I8d364c9fa0ebb0db29cedf7032b8655a0c29ee02\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f904ab9140b4a8682028cc4f23c626f4c9153c3c", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "d10d6b7234e5957afbe8dce6a60fc8c73be7ac9b", "5a3571811cde5908cd082b13d1699ed6658bede7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:43:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:43:58 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14 QPR3 to AOSP main\" into main am: 5a3571811c -s ours\n\nam skip reason: Merged-In I22167c7b3de40d816584db6053d0bf1b19d26d46 with SHA-1 020035a856 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3131841\n\nChange-Id: Ie6fbd4378721e0ecb611d7a0590d7829b5a83cb1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d10d6b7234e5957afbe8dce6a60fc8c73be7ac9b", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "020035a856b4f873ba003e183584f13579a79e6a", "35d1e928688745133dd9498a05fe5d1bff0fdfe9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:42:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:42:06 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 35d1e92868 -s ours\n\nam skip reason: Merged-In I22167c7b3de40d816584db6053d0bf1b19d26d46 with SHA-1 020035a856 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3131841\n\nChange-Id: If48fda97f0fa6867d46ffbb4e16606d02c638ea2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5a3571811cde5908cd082b13d1699ed6658bede7", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "19f9d8c7b37e67fe3ac839cf9385caa178f6a47c", "35d1e928688745133dd9498a05fe5d1bff0fdfe9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 18:51:28 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 17 18:51:28 2024 +0000" }, "message": "Merge \"Merge Android 14 QPR3 to AOSP main\" into main" }, { "commit": "35d1e928688745133dd9498a05fe5d1bff0fdfe9", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "19f9d8c7b37e67fe3ac839cf9385caa178f6a47c", "020035a856b4f873ba003e183584f13579a79e6a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:15 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:15 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: I22167c7b3de40d816584db6053d0bf1b19d26d46\nChange-Id: Icbc7f4b429c6aecd9445945569b5b7a9695ec498\n" }, { "commit": "9744463aed6d4fed2a69403ae9b60c523d305976", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "be4cf5bfab29464daa6ac081eba773e32e6665be", "020035a856b4f873ba003e183584f13579a79e6a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue May 21 03:09:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 21 03:09:58 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 020035a856 -s ours\n\nam skip reason: Merged-In Ica83671c2c0892f282c26ba3c96f993a0b6fe699 with SHA-1 9cabf2612f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/27273329\n\nChange-Id: If5c1f3f00b0ba0ceec6ee8308f9b236503609dfa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "020035a856b4f873ba003e183584f13579a79e6a", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "47c1f1d4ca00f50b976e043f4a72a401443c3fd0", "9cabf2612f0e1230651b23b529d957e939d99a71" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:24 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:24 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Ica83671c2c0892f282c26ba3c96f993a0b6fe699\nChange-Id: I22167c7b3de40d816584db6053d0bf1b19d26d46\n" }, { "commit": "be4cf5bfab29464daa6ac081eba773e32e6665be", "tree": "d4f192b4e2d151d482e238d2ccf7ec68b47fef8d", "parents": [ "9cabf2612f0e1230651b23b529d957e939d99a71", "47c1f1d4ca00f50b976e043f4a72a401443c3fd0" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 17:40:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 17:40:54 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 19f9d8c7b3 am: 47c1f1d4ca\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/2946236\n\nChange-Id: I4b39a0315234b6c3ecfdbca246c9a267df35a816\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "47c1f1d4ca00f50b976e043f4a72a401443c3fd0", "tree": "074bb881685c944042a85fee12aba61018b05e76", "parents": [ "c522b14186560a2faa5e846371cb97a038a0de13", "19f9d8c7b37e67fe3ac839cf9385caa178f6a47c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 16:54:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 16:54:40 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: 19f9d8c7b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/2946236\n\nChange-Id: I76408557499d0e725231e447341ecc0672dbcb51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19f9d8c7b37e67fe3ac839cf9385caa178f6a47c", "tree": "074bb881685c944042a85fee12aba61018b05e76", "parents": [ "c522b14186560a2faa5e846371cb97a038a0de13", "94cd4007946fe75f7446d92c7b84098af0e0f896" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 16:32:30 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 22 16:32:30 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main" }, { "commit": "94cd4007946fe75f7446d92c7b84098af0e0f896", "tree": "074bb881685c944042a85fee12aba61018b05e76", "parents": [ "c522b14186560a2faa5e846371cb97a038a0de13" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:58:07 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:58:07 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model\n\nThis CL is created as a best effort to migrate test targets to the new Android ownership model.\nIt is based on historical data from repository history and insights from git blame.\nGiven the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary\nattribution in this CL, please create a new CL to fix that.\n\nFor detailed guidelines and further information on the migration please refer to the link below,\ngo/new-android-ownership-model\n\nBug: 304529413\nTest: N/A\nChange-Id: I3383ced5c874016832c64ce6e10742f7a47df910\n" }, { "commit": "9cabf2612f0e1230651b23b529d957e939d99a71", "tree": "b4483fe9156132335880296718c30f4e31559836", "parents": [ "c522b14186560a2faa5e846371cb97a038a0de13" ], "author": { "name": "Fangqiu Su", "email": "fangqiu@google.com", "time": "Tue Dec 19 18:13:58 2023 +0000" }, "committer": { "name": "Fangqiu Su", "email": "fangqiu@google.com", "time": "Tue Dec 19 18:13:58 2023 +0000" }, "message": "Update the imports to androidx.test.filters.*\n\nBug: 316941721\nTest: mmma .\nChange-Id: Ica83671c2c0892f282c26ba3c96f993a0b6fe699\n" }, { "commit": "c522b14186560a2faa5e846371cb97a038a0de13", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "8c374b03c01433f6aa3f2dd121523f2a8811fe79", "07c476ae6d0186aa31d8b3edc864b07b5f55e267" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 09:00:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 09:00:13 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am: 84975a4332 -s ours am: e154e7e6c6 -s ours am: 07c476ae6d -s ours\n\nam skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440\n\nChange-Id: I017dabf6708f923301bd6bc7944c3e0e4d537612\n" }, { "commit": "07c476ae6d0186aa31d8b3edc864b07b5f55e267", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "4553997a7115647fbe271e1b538605ce4a5f79ec", "e154e7e6c64c429202b29be9566a9e116190f794" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 08:30:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 08:30:02 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am: 84975a4332 -s ours am: e154e7e6c6 -s ours\n\nam skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440\n\nChange-Id: Ibd320641fffe7d4fde996a5be882f52ce59d9893\n" }, { "commit": "e154e7e6c64c429202b29be9566a9e116190f794", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "17b8a3cb2f78fcca2475dca3bfabd3263d14f5f6", "84975a43328340ec43b9053841c056ee511e35b8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 07:57:05 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 07:57:05 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am: 84975a4332 -s ours\n\nam skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440\n\nChange-Id: Ia694a96ca1e10688a9dc425c75c204333cd3f2ae\n" }, { "commit": "84975a43328340ec43b9053841c056ee511e35b8", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "8bf09180455ac4c95ebbf08d2e844762f8e5a9d8", "f8ff433f2974d06f71adb582dbe4d0b75ce0b770" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 01:39:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 01:39:49 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours\n\nam skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440\n\nChange-Id: Ia0afb405553cd7bcf5ee2ef1282081a37e09c408\n" }, { "commit": "f8ff433f2974d06f71adb582dbe4d0b75ce0b770", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "43f6eccdbed75de0bd79ba2331eb9026bf540be0", "2d9cb9aa925d7e7d11bb44719bf3e4536d9a8075" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 01:20:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 01:20:23 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: 2d9cb9aa92 -s ours\n\nam skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440\n\nChange-Id: I97f979111e1cd992f53019aacfc3ec7317392296\n" }, { "commit": "2d9cb9aa925d7e7d11bb44719bf3e4536d9a8075", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "907ed0923b996d5ad5b20f39b7d37529761fb48d", "d509f4e1d4d3ce26036e4f914f9fdd56964c3356" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 07 23:50:28 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 07 23:50:28 2021 +0000" }, "message": "Merge \"Merge Android 12\"" }, { "commit": "d509f4e1d4d3ce26036e4f914f9fdd56964c3356", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "907ed0923b996d5ad5b20f39b7d37529761fb48d", "43f6eccdbed75de0bd79ba2331eb9026bf540be0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 06 22:53:37 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 06 22:53:37 2021 +0000" }, "message": "Merge Android 12\n\nBug: 202323961\nMerged-In: If0b691fb263ee2717844e8bda388310d2360ffd6\nChange-Id: I9de23217a0b002a577a47086e1d6a9794a8b657f\n" }, { "commit": "8c374b03c01433f6aa3f2dd121523f2a8811fe79", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "2e6cc60bfbf24b4d2e0539700eb81126e2bf297a", "4553997a7115647fbe271e1b538605ce4a5f79ec" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 18 00:24:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 18 00:24:12 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours am: 8bf0918045 -s ours am: 17b8a3cb2f -s ours am: 4553997a71 -s ours\n\nam skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660\n\nChange-Id: I18c380950111007dcaaaaa67d894b822bf0885c2\n" }, { "commit": "4553997a7115647fbe271e1b538605ce4a5f79ec", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "e195d494a5a8880c8aff2d6495d0d255383f0c58", "17b8a3cb2f78fcca2475dca3bfabd3263d14f5f6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 20:32:53 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 20:32:53 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours am: 8bf0918045 -s ours am: 17b8a3cb2f -s ours\n\nam skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660\n\nChange-Id: Ic2cfc8e9e72fac0043dc3d0176af7a205ba260d3\n" }, { "commit": "17b8a3cb2f78fcca2475dca3bfabd3263d14f5f6", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "e195d494a5a8880c8aff2d6495d0d255383f0c58", "8bf09180455ac4c95ebbf08d2e844762f8e5a9d8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 19:46:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 19:46:49 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours am: 8bf0918045 -s ours\n\nam skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660\n\nChange-Id: I2901f53bf8a2102e736976e5e7e9f91152a7c7d8\n" }, { "commit": "8bf09180455ac4c95ebbf08d2e844762f8e5a9d8", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "e195d494a5a8880c8aff2d6495d0d255383f0c58", "43f6eccdbed75de0bd79ba2331eb9026bf540be0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 18:36:18 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 18:36:18 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours\n\nam skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660\n\nChange-Id: If9caba63fe75186282bf57e7d6dffe4071ceb447\n" }, { "commit": "43f6eccdbed75de0bd79ba2331eb9026bf540be0", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "907ed0923b996d5ad5b20f39b7d37529761fb48d", "e195d494a5a8880c8aff2d6495d0d255383f0c58" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Aug 14 06:31:20 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Aug 14 06:31:20 2021 +0000" }, "message": "Merge sc-dev-plus-aosp-without-vendor@7634622\n\nMerged-In: I3187fe574f21977fa8006ab92072636f2ee110ce\nChange-Id: If0b691fb263ee2717844e8bda388310d2360ffd6\n" }, { "commit": "2e6cc60bfbf24b4d2e0539700eb81126e2bf297a", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "0dbc3d6b98ea1925b99f10d4951b3509d962c9ae", "f465350c4d285fa131629b1e229dfc1bf113d1be" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:51:42 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:51:42 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: I34e65f1765371755a217703e4345230e4feb0ac4\n" }, { "commit": "f465350c4d285fa131629b1e229dfc1bf113d1be", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "7bb1f3b0ebe44e28fbd3e34da7e6995d0c7a2d82", "e195d494a5a8880c8aff2d6495d0d255383f0c58" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 20:11:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:11:25 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\" am: a097a2b9dd am: 907ed0923b am: 038e536f26 am: e195d494a5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I472612ac46893a09f4270547c0e65682fa4c691c\n" }, { "commit": "0dbc3d6b98ea1925b99f10d4951b3509d962c9ae", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "7bb1f3b0ebe44e28fbd3e34da7e6995d0c7a2d82", "e195d494a5a8880c8aff2d6495d0d255383f0c58" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 20:08:05 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:08:05 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\" am: a097a2b9dd am: 907ed0923b am: 038e536f26 am: e195d494a5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iee3a920859a037fa58edea894200c776db0c10b3\n" }, { "commit": "e195d494a5a8880c8aff2d6495d0d255383f0c58", "tree": "c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961", "parents": [ "7bb1f3b0ebe44e28fbd3e34da7e6995d0c7a2d82", "038e536f263c6ff65ad6bc4355fd99388651504d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 19:41:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 19:41:12 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\" am: a097a2b9dd am: 907ed0923b am: 038e536f26\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I3187fe574f21977fa8006ab92072636f2ee110ce\n" }, { "commit": "038e536f263c6ff65ad6bc4355fd99388651504d", "tree": "2854bb34d7de57053af99588f4f1d1a8d1c07337", "parents": [ "082969a5b2dea5cf9ea415d2b736886d38991e3c", "907ed0923b996d5ad5b20f39b7d37529761fb48d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 18:48:16 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 18:48:16 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\" am: a097a2b9dd am: 907ed0923b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I4ef46562282f2182de813e9215e399ff3d73a707\n" }, { "commit": "907ed0923b996d5ad5b20f39b7d37529761fb48d", "tree": "2854bb34d7de57053af99588f4f1d1a8d1c07337", "parents": [ "082969a5b2dea5cf9ea415d2b736886d38991e3c", "a097a2b9ddc76e5e69d4870908dad4579a650ede" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 18:18:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 18:18:31 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\" am: a097a2b9dd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ifbdc1f4043f13b48ddd75e3cb3d66f23d7dc2d3e\n" }, { "commit": "a097a2b9ddc76e5e69d4870908dad4579a650ede", "tree": "2854bb34d7de57053af99588f4f1d1a8d1c07337", "parents": [ "082969a5b2dea5cf9ea415d2b736886d38991e3c", "333340f3213438358153d50c199331172363a851" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 17:44:06 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 16 17:44:06 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\"" }, { "commit": "333340f3213438358153d50c199331172363a851", "tree": "2854bb34d7de57053af99588f4f1d1a8d1c07337", "parents": [ "082969a5b2dea5cf9ea415d2b736886d38991e3c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 16:39:15 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 16:39:15 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n Android.bp\n tests/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I2713f82308d47e18ff4a53d6566e9812bc1c587f\n" }, { "commit": "7bb1f3b0ebe44e28fbd3e34da7e6995d0c7a2d82", "tree": "93cd82bab57f67d200ad32e5eb7bd92a0000a781", "parents": [ "a2910ddf2e208436c4716f71efdf3efb792aff0b" ], "author": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Mon Sep 14 08:27:48 2020 -0700" }, "committer": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Mon Oct 26 23:34:49 2020 -0700" }, "message": "Migrate Time class to use Calendar APIs.\n\nMigrate the internal Time class from using the android.text.format.Time\nAPIs to using the java.util.Calendar APIs.\n\nNote: The dst flag was removed in this CL because all member variables\nwere made private and can only be accessed by getters and setters. This\nprevents unexpected behavior to occur around the dst transition border\nwith the current usages of #normalize and #toMillis. See\nAPPLY_DST_CHANGE_LOGIC flag documentation for more information.\n\nBug: 159019762\nTest: atest TimeTest\nTest: atest CalendarCommonTests\nTest: atest CalendarProviderTests\nTest: atest CtsCalendarProviderTestCases\nTest: atest CtsCalendarcommon2TestCases\nChange-Id: I31562d335a23b1f96888c121937b12daf0af3325\n" }, { "commit": "a2910ddf2e208436c4716f71efdf3efb792aff0b", "tree": "86b4407700e8231d7fb9b257abbf43f346d9e908", "parents": [ "f573431ab2d3b7192f6fac0c0468f37adc5e302a", "082969a5b2dea5cf9ea415d2b736886d38991e3c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 21:27:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 21:27:53 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: f1445a64e7 -s ours am: cca67f2933 -s ours am: b7230439a5 -s ours am: b64a28155a -s ours am: 082969a5b2 -s ours\n\nam skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396\n\nChange-Id: I715fb8999e05f0ec8ecd48909a06c762dc35ff72\n" }, { "commit": "082969a5b2dea5cf9ea415d2b736886d38991e3c", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "52c9843fa02026865333f4a2b78a85a8378c772f", "b64a28155ae3c48b41ffe9a02e7080382646b89f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 03:59:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 03:59:24 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: f1445a64e7 -s ours am: cca67f2933 -s ours am: b7230439a5 -s ours am: b64a28155a -s ours\n\nam skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396\n\nChange-Id: I8c570e3fbe169c231341f52fbb65a13296df5b30\n" }, { "commit": "b64a28155ae3c48b41ffe9a02e7080382646b89f", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "6fcf6b2995eef78f993c679fa82f82671eb3a2fc", "b7230439a53a22020effcc50ace36671360a83cc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 03:33:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 03:33:53 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: f1445a64e7 -s ours am: cca67f2933 -s ours am: b7230439a5 -s ours\n\nam skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396\n\nChange-Id: I5f7ba8c1ad60ac1e1baf3bbb0a73be68b2e79db4\n" }, { "commit": "b7230439a53a22020effcc50ace36671360a83cc", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "27056d6fac23818363c84eb6ff5c6b256fb55f9c", "cca67f29339a1e1faa7dd9a45c7fa70314213064" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 02:03:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 02:03:02 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: f1445a64e7 -s ours am: cca67f2933 -s ours\n\nam skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396\n\nChange-Id: I408242631d648790b12e921bf79fb215f39b3eb6\n" }, { "commit": "cca67f29339a1e1faa7dd9a45c7fa70314213064", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "dc37d34d50947eede476221bedef264622a5a7ac", "f1445a64e794bf50ffc1dc587ee90121551b68df" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Sep 11 00:40:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 11 00:40:51 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R\" am: f1445a64e7 -s ours\n\nam skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396\n\nChange-Id: I5c1e2a5249889ab9cd45837683fce7a7d87ad7f6\n" }, { "commit": "f1445a64e794bf50ffc1dc587ee90121551b68df", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58", "e52edf0582f05d71432abd1a3b6dca1a5cc0e1ad" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 10 17:22:18 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 10 17:22:18 2020 +0000" }, "message": "Merge \"Merge Android R\"" }, { "commit": "e52edf0582f05d71432abd1a3b6dca1a5cc0e1ad", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58", "dc37d34d50947eede476221bedef264622a5a7ac" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 08 16:55:23 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 08 16:55:23 2020 -0700" }, "message": "Merge Android R\n\nBug: 168057903\nMerged-In: I89c5b4a70013ab98ec5428794ec301c5ef191af3\nChange-Id: I080df3a9ab84136296895e9e83e9b05090c6bc87\n" }, { "commit": "f573431ab2d3b7192f6fac0c0468f37adc5e302a", "tree": "86b4407700e8231d7fb9b257abbf43f346d9e908", "parents": [ "b55d9bce898b9742da80bff0ab1362ffd010b9fd", "52c9843fa02026865333f4a2b78a85a8378c772f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 02 01:59:46 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 01:59:46 2020 +0000" }, "message": "[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am: 6fcf6b2995 -s ours am: 52c9843fa0 -s ours\n\nam skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128\n\nChange-Id: I94d34a7b35130870e755c354c882dc49d035fb83\n" }, { "commit": "52c9843fa02026865333f4a2b78a85a8378c772f", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "6e29ad1dfe9b353af1c41a30101673bf01d7a144", "6fcf6b2995eef78f993c679fa82f82671eb3a2fc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 22:10:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 22:10:20 2020 +0000" }, "message": "[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am: 6fcf6b2995 -s ours\n\nam skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128\n\nChange-Id: I3e2428840a58ab3ea386cbc4111be2d174fe8bbf\n" }, { "commit": "6fcf6b2995eef78f993c679fa82f82671eb3a2fc", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "6e29ad1dfe9b353af1c41a30101673bf01d7a144", "27056d6fac23818363c84eb6ff5c6b256fb55f9c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 21:47:05 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:47:05 2020 +0000" }, "message": "[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours\n\nam skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128\n\nChange-Id: Ib3261d314ac9139f68f041b85621f8399dbfbe0c\n" }, { "commit": "27056d6fac23818363c84eb6ff5c6b256fb55f9c", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "6e29ad1dfe9b353af1c41a30101673bf01d7a144", "dc37d34d50947eede476221bedef264622a5a7ac" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 20:37:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:37:28 2020 +0000" }, "message": "[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours\n\nam skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128\n\nChange-Id: If8288b87c773f99ff77307a057acd92bda0176dd\n" }, { "commit": "dc37d34d50947eede476221bedef264622a5a7ac", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58", "6e29ad1dfe9b353af1c41a30101673bf01d7a144" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 10:16:40 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 10:16:40 2020 -0700" }, "message": "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\n\nBug: 166295507\nMerged-In: If468db15d0f66ca059460fbf09d360360cfe8cdd\nChange-Id: I89c5b4a70013ab98ec5428794ec301c5ef191af3\n" }, { "commit": "b55d9bce898b9742da80bff0ab1362ffd010b9fd", "tree": "86b4407700e8231d7fb9b257abbf43f346d9e908", "parents": [ "6e29ad1dfe9b353af1c41a30101673bf01d7a144" ], "author": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Fri Aug 14 12:17:17 2020 -0700" }, "committer": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Fri Aug 14 15:58:28 2020 -0700" }, "message": "Introduce Time class to help with migration.\n\nThis class will help migrate from android.text.format.Time. Currently,\nit has the same API so that no friction is caused in the inital\ntransition.\n\nUnit tests have been added to ensure future changes don\u0027t cause\nregressions when transitioning to a more robust Time API.\n\nBug: 159019762\nTest: atest TimeTest\nTest: atest CalendarCommonTests\nTest: atest CalendarProviderTests\nChange-Id: Ic640712cd48f0f4f7abfd8111bdac7d9a430574d\n" }, { "commit": "6e29ad1dfe9b353af1c41a30101673bf01d7a144", "tree": "22fabdf2db0179ed308c4e72ce902bebd5fda3c0", "parents": [ "1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58" ], "author": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Thu Nov 21 13:41:05 2019 -0800" }, "committer": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Thu Nov 21 13:41:05 2019 -0800" }, "message": "Fix day of year value in RecurrenceProcessor.\n\nRecurrenceProcessor#yearDay was returning incorrectly for July 1st due\nto a wrong hard-coded value. Updating it to the correct value and adding\nsome unit tests for the function.\n\nBug: 111972497\nTest: atest com.android.calendarcommon2.RecurrenceProcessorTest#testYearDay\nChange-Id: If468db15d0f66ca059460fbf09d360360cfe8cdd\n" }, { "commit": "1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "60cc4bb0d41ceb5293565ac9810450a16c513482", "d04d7982c438dda014a3ffc772f88a7b9373d8da" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Feb 24 02:27:58 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Feb 24 02:27:58 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\nam: d04d7982c4 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ib848b07a9bdde6c6d6b83f3d2476eb4a3eeaa729\n" }, { "commit": "d04d7982c438dda014a3ffc772f88a7b9373d8da", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "ac27038f29cb1fb0ff3c6357b3d198badde01832", "d697cba5c2f9ddd795cc24a22de8417b68f4c86e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:19:21 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:19:21 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: I508c6f48aa4ffb22aba3fcb583b8fd3f51b25b33\n" }, { "commit": "60cc4bb0d41ceb5293565ac9810450a16c513482", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c01d429a5f2c10e77d19a5f4ba215524376d5b4b", "d697cba5c2f9ddd795cc24a22de8417b68f4c86e" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 19:02:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 19:02:27 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 72af45fd2b -s ours am: ac27038f29 -s ours\nam: d697cba5c2 -s ours\n\nChange-Id: I4a186e58a8f97be521b6b4f16a796bedcca6f999\n" }, { "commit": "d697cba5c2f9ddd795cc24a22de8417b68f4c86e", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "87aff5920a345eb6b76562d5ee0bac054d9e5f0b", "ac27038f29cb1fb0ff3c6357b3d198badde01832" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 18:41:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 18:41:07 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 72af45fd2b -s ours\nam: ac27038f29 -s ours\n\nChange-Id: Iffca9dad44a31b0b57929bf8e91eaf216fcc2786\n" }, { "commit": "ac27038f29cb1fb0ff3c6357b3d198badde01832", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "42b0be0f8ee42dab8294e00990aa845402a04aa5", "72af45fd2b6a6fd0f14b25fdb4b98b435a0c24e3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 16:18:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 16:18:26 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE\nam: 72af45fd2b -s ours\n\nChange-Id: I1e2164a1d3f2eca423910800c25de351bdcbce86\n" }, { "commit": "72af45fd2b6a6fd0f14b25fdb4b98b435a0c24e3", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "2e046db8d38577b128f2732809dd45fb95cfb57c", "ecfba85ff17b25e635e1ee4c87688e63c6dedbe2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 14:46:59 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 14:46:59 2018 -0700" }, "message": "Merge pie-platform-release to aosp-master - DO NOT MERGE\n\nChange-Id: Ib298814e53f0368562347ed44e4514d55a840e55\n" }, { "commit": "c01d429a5f2c10e77d19a5f4ba215524376d5b4b", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "584fe7a3252c735fbb74a5ca134d6378f610df39", "87aff5920a345eb6b76562d5ee0bac054d9e5f0b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 10:11:52 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 10:11:52 2018 -0700" }, "message": "[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 42b0be0f8e -s ours\nam: 87aff5920a -s ours\n\nChange-Id: I36502ca21cb6ca63c1b9975d4df242b4193b3cb7\n" }, { "commit": "87aff5920a345eb6b76562d5ee0bac054d9e5f0b", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c626121cf0134ec4e412f45ce877544716ee2e97", "42b0be0f8ee42dab8294e00990aa845402a04aa5" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:54:04 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 09:54:04 2018 -0700" }, "message": "[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE\nam: 42b0be0f8e -s ours\n\nChange-Id: I7c04cfc0e7828d23b8cf43ef0f19fbafddf59ad7\n" }, { "commit": "42b0be0f8ee42dab8294e00990aa845402a04aa5", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "2e046db8d38577b128f2732809dd45fb95cfb57c", "ecfba85ff17b25e635e1ee4c87688e63c6dedbe2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:06:50 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:06:50 2018 -0700" }, "message": "Merge pi-platform-release to stage-aosp-master - DO NOT MERGE\n\nChange-Id: Ic08dcd0ddde7526da7ced97e3fedcc5c64fd7fe0\n" }, { "commit": "584fe7a3252c735fbb74a5ca134d6378f610df39", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c0246198be80c6a8185aba01707e3c6ecba21222", "c626121cf0134ec4e412f45ce877544716ee2e97" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Aug 17 18:44:30 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 18:44:30 2018 -0700" }, "message": "Merge \"Convert frameworks/opt/calendar to Android.bp\" am: 8cc927f20f am: 2e046db8d3\nam: c626121cf0\n\nChange-Id: I5b8556d437d2c4b897b1e00769aa2c90c0d3986a\n" }, { "commit": "c626121cf0134ec4e412f45ce877544716ee2e97", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c0246198be80c6a8185aba01707e3c6ecba21222", "2e046db8d38577b128f2732809dd45fb95cfb57c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Aug 17 17:59:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 17:59:07 2018 -0700" }, "message": "Merge \"Convert frameworks/opt/calendar to Android.bp\" am: 8cc927f20f\nam: 2e046db8d3\n\nChange-Id: I112950aa84d545c71b2672237e4f68ec4c8edfe4\n" }, { "commit": "2e046db8d38577b128f2732809dd45fb95cfb57c", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c0246198be80c6a8185aba01707e3c6ecba21222", "8cc927f20f233ff9a7bd67bf3abfb55eafc9d1ff" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Aug 17 17:14:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 17:14:27 2018 -0700" }, "message": "Merge \"Convert frameworks/opt/calendar to Android.bp\"\nam: 8cc927f20f\n\nChange-Id: I1c9b9b134fcd8e36ce045a57cfb818bd70ef22d7\n" }, { "commit": "8cc927f20f233ff9a7bd67bf3abfb55eafc9d1ff", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c0246198be80c6a8185aba01707e3c6ecba21222", "9a6e7a96eb31d78fdd7d5c361ff94f4349369668" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 23:08:52 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 17 23:08:52 2018 +0000" }, "message": "Merge \"Convert frameworks/opt/calendar to Android.bp\"" }, { "commit": "9a6e7a96eb31d78fdd7d5c361ff94f4349369668", "tree": "ae0aa56df500fcb19c63297ad7385dc15093d40c", "parents": [ "c0246198be80c6a8185aba01707e3c6ecba21222" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Aug 16 21:47:55 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Aug 16 22:09:01 2018 -0700" }, "message": "Convert frameworks/opt/calendar to Android.bp\n\nSee build/soong/README.md for more information.\n\nTest: m checkbuild\nTest: atest CalendarCommonTests\nChange-Id: Ib914c5ff464240fa136306e8dde8b90507bf887d\n" }, { "commit": "ecfba85ff17b25e635e1ee4c87688e63c6dedbe2", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "48272187a7d0c0d132160d18e70276f6238cb974", "c0246198be80c6a8185aba01707e3c6ecba21222" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Feb 27 08:21:59 2018 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Feb 27 08:21:59 2018 +0000" }, "message": "Snap for 4623514 from c0246198be80c6a8185aba01707e3c6ecba21222 to pi-release\n\nChange-Id: I6d1ed97ab6528f3f2060abf231c6a0feb06e4120\n" }, { "commit": "c0246198be80c6a8185aba01707e3c6ecba21222", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "a4baee7fe55f82ec0576aa173e5e6555fe8552ea", "a45e03ffb6bfb7364a1ed8d54342c7defc9893fe" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Feb 26 17:36:59 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 26 17:36:59 2018 +0000" }, "message": "Merge \"frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.\" am: 03dbebcdc8 am: 7d5a0a9ef7\nam: a45e03ffb6 -s ours\n\nChange-Id: I1cea3d77a7d392480ced11cc7ec84015e6ad2cf1\n" }, { "commit": "a45e03ffb6bfb7364a1ed8d54342c7defc9893fe", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "3f01563afad6b3d2f0546a6260ef958a8173deb6", "7d5a0a9ef760c82af5da8e65e0d3cb9d3ab18735" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Feb 26 17:28:57 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 26 17:28:57 2018 +0000" }, "message": "Merge \"frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.\" am: 03dbebcdc8\nam: 7d5a0a9ef7\n\nChange-Id: I456a55497b102a8fce0296f9d6fa9a93845f4dba\n" }, { "commit": "7d5a0a9ef760c82af5da8e65e0d3cb9d3ab18735", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "3f01563afad6b3d2f0546a6260ef958a8173deb6", "03dbebcdc8c9dfe18b51fe129ca03c846b3a6ff7" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Feb 26 17:21:26 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 26 17:21:26 2018 +0000" }, "message": "Merge \"frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.\"\nam: 03dbebcdc8\n\nChange-Id: I10185d7b82588ff5fdcc916dacb3a20abfa9615a\n" }, { "commit": "03dbebcdc8c9dfe18b51fe129ca03c846b3a6ff7", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "3f01563afad6b3d2f0546a6260ef958a8173deb6", "7b2f5d1007e4fe6c81499e3a58ad8299a130d696" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Feb 26 17:08:39 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 26 17:08:39 2018 +0000" }, "message": "Merge \"frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.\"" }, { "commit": "7b2f5d1007e4fe6c81499e3a58ad8299a130d696", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "3f01563afad6b3d2f0546a6260ef958a8173deb6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Feb 22 17:46:54 2018 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Feb 26 15:46:39 2018 +0000" }, "message": "frameworks/opt/calendar: 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: Icec5c913512e2cffbba52353d84559ca4793437b\nMerged-In: I6b6411cb008ddaf9f1aac419bf7432b3215f100a\n" }, { "commit": "a4baee7fe55f82ec0576aa173e5e6555fe8552ea", "tree": "90f66e2ac2376074c9e13b5140c9ce9c0d46b195", "parents": [ "5151af823c9c03bedd30b41caaa01e53e3324c76" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Feb 22 17:46:54 2018 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Feb 22 17:47:19 2018 +0000" }, "message": "frameworks/opt/calendar: 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: I6b6411cb008ddaf9f1aac419bf7432b3215f100a\n" }, { "commit": "48272187a7d0c0d132160d18e70276f6238cb974", "tree": "d6f36e979eb12b932b5d8196d49583601982fcc1", "parents": [ "3f01563afad6b3d2f0546a6260ef958a8173deb6", "5151af823c9c03bedd30b41caaa01e53e3324c76" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Mon Dec 11 12:12:52 2017 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Mon Dec 11 12:12:52 2017 +0000" }, "message": "Snap for 4496165 from 5151af823c9c03bedd30b41caaa01e53e3324c76 to pi-release\n\nChange-Id: I1764100fb8e0461783507b339c6bdf652516d515\n" }, { "commit": "5151af823c9c03bedd30b41caaa01e53e3324c76", "tree": "d6f36e979eb12b932b5d8196d49583601982fcc1", "parents": [ "3f01563afad6b3d2f0546a6260ef958a8173deb6" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Dec 08 00:02:42 2017 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Dec 08 00:07:23 2017 +0000" }, "message": "Stop statically including legacy-android-test\n\nStatically including legacy-android-test leads to duplicate classes\nwhich causes build time problems (with Proguard) and runtime problems on\nolder SDK versions. This change:\n* Stops statically including legacy-android-test.\n* Adds compile time dependencies on andoid.test.base, android.test.mock\n and android.test.runner where necessary.\n* Adds \u003cuses-library android:name\u003d\"android.test.runner\"/\u003e to any\n affected package to ensure that the classes that were included by\n legacy-android-test are still available at runtime. That also adds a\n dependency on android.test.base and android.test.mock.\n\nThe following change descriptions were generated automatically and so\nmay be a little repetitive. They are provided to give the reviewer\nenough information to check the comments match what has actually been\nchanged and check the reasoning behind the changes.\n\n* tests/Android.mk\n Added \u0027android.test.base\u0027 to LOCAL_JAVA_LIBRARIES because\n CalendarCommonTests\u0027s source depends on its classes and because of\n these changes they are no longer present on the compilation path.\n\n Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES\n because statically including the classes in CalendarCommonTests\n results in duplicate classes which leads to build time and compile\n time issues.\n\nBug: 30188076\nTest: make checkbuild\nChange-Id: Iadc6b967caaf8d5ce5b8a348ad33e1407da8470f\n" }, { "commit": "3f01563afad6b3d2f0546a6260ef958a8173deb6", "tree": "5017f59cfb85f1dac90e2483863788e4fe56860c", "parents": [ "3f47856377406ce14cc43492808aa5f84cdf52e9", "886d7d1277b82347c30ec5d79ba1576680947bb8" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Jan 18 15:00:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 15:00:37 2017 +0000" }, "message": "Merge \"Prepare for removal of legacy-test from default targets\" am: 524cce0089 am: f40b38da25 am: 6db7eaee89\nam: 886d7d1277\n\nChange-Id: I9fc9b526e1ce01ecf07c04d2f12e6f5c59c732f4\n" }, { "commit": "886d7d1277b82347c30ec5d79ba1576680947bb8", "tree": "a6afbdebfe4c0eac5973ba26d0146e42dcca22a7", "parents": [ "03b18577f8f8f799e87a62b8e03889ddacf6daa2", "6db7eaee89ada541a5efcd807846838d34c6e482" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Jan 18 14:55:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 14:55:31 2017 +0000" }, "message": "Merge \"Prepare for removal of legacy-test from default targets\" am: 524cce0089 am: f40b38da25\nam: 6db7eaee89\n\nChange-Id: Ic239177bae70d78b29eb16acf3cc42e8f31983c3\n" }, { "commit": "6db7eaee89ada541a5efcd807846838d34c6e482", "tree": "a6afbdebfe4c0eac5973ba26d0146e42dcca22a7", "parents": [ "03b18577f8f8f799e87a62b8e03889ddacf6daa2", "f40b38da253ce9c2ab94725a35d3174545934971" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Jan 18 14:29:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 14:29:05 2017 +0000" }, "message": "Merge \"Prepare for removal of legacy-test from default targets\" am: 524cce0089\nam: f40b38da25\n\nChange-Id: I2f3eee0caeb944a5b7962ab86e74ad2bb009caa9\n" }, { "commit": "f40b38da253ce9c2ab94725a35d3174545934971", "tree": "a6afbdebfe4c0eac5973ba26d0146e42dcca22a7", "parents": [ "03b18577f8f8f799e87a62b8e03889ddacf6daa2", "524cce008901f0e16a59d0982c18e964473950b0" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Jan 18 14:24:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 14:24:04 2017 +0000" }, "message": "Merge \"Prepare for removal of legacy-test from default targets\"\nam: 524cce0089\n\nChange-Id: I3345eaf0c2d4c7cdfcf46258919cc450252e7bc7\n" }, { "commit": "524cce008901f0e16a59d0982c18e964473950b0", "tree": "a6afbdebfe4c0eac5973ba26d0146e42dcca22a7", "parents": [ "03b18577f8f8f799e87a62b8e03889ddacf6daa2", "2de86d3eaf4d22baa452817e549516cc4add1bf8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 14:16:51 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 18 14:16:52 2017 +0000" }, "message": "Merge \"Prepare for removal of legacy-test from default targets\"" }, { "commit": "2de86d3eaf4d22baa452817e549516cc4add1bf8", "tree": "a6afbdebfe4c0eac5973ba26d0146e42dcca22a7", "parents": [ "03b18577f8f8f799e87a62b8e03889ddacf6daa2" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Jan 17 14:49:41 2017 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Jan 17 14:49:41 2017 +0000" }, "message": "Prepare for removal of legacy-test from default targets\n\nIn preparation for removing junit classes from the Android API\nthe legacy-test target will be removed from the\nTARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit\ndependencies on junit and/or legacy-android-test to ensure that\nmodules will compile properly once it is removed.\n\nBug: 30188076\nTest: make checkbuild\nChange-Id: Ic37712e161ed1daeff800fb10e21c9f59682efe7\n" }, { "commit": "3f47856377406ce14cc43492808aa5f84cdf52e9", "tree": "6b4fff304fa40566f2e20f9828679d8be8d4537d", "parents": [ "03b18577f8f8f799e87a62b8e03889ddacf6daa2" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 12 15:21:52 2016 -0700" }, "committer": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 13:25:04 2016 -0700" }, "message": "Fix inconsistencies in RecurrenceSet.\n\n- Handle multi-line EXRULE and RDATE.\n- Fix existing tests.\n- Add more tests.\n\nFixes: 31054618\nTest: adb shell am instrument -w com.android.calendarcommon2.tests/android.test.InstrumentationTestRunner\nChange-Id: I73eb8dc876adb253e093d68685deefcc9b02953e\n" }, { "commit": "03b18577f8f8f799e87a62b8e03889ddacf6daa2", "tree": "73aa7a4c7f15e441cc8615a05d6b1311e894b045", "parents": [ "e017a53a1a90ac1c62c1de549d63138bd8237f7d", "8d85c6c7a7f853ff25554dea9bc6403a75fb68ef" ], "author": { "name": "Alon Albert", "email": "aalbert@google.com", "time": "Wed Apr 03 12:38:01 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 03 12:38:01 2013 -0700" }, "message": "am 8d85c6c7: Split EXDATE with a Newline Delimiter\n\n* commit \u00278d85c6c7a7f853ff25554dea9bc6403a75fb68ef\u0027:\n Split EXDATE with a Newline Delimiter\n" }, { "commit": "8d85c6c7a7f853ff25554dea9bc6403a75fb68ef", "tree": "2c550ac62d4d5641b25489afc0d3e51e0a53a655", "parents": [ "6e5eff5f9bd9ec3e2d4508e4e62b181f171688ab" ], "author": { "name": "Alon Albert", "email": "aalbert@google.com", "time": "Wed Mar 06 16:11:46 2013 -0800" }, "committer": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Wed Apr 03 10:24:08 2013 -0700" }, "message": "Split EXDATE with a Newline Delimiter\n\nSo we can support multiple exdate values.\n\nBug: 8331334\nChange-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f\n" }, { "commit": "e017a53a1a90ac1c62c1de549d63138bd8237f7d", "tree": "73aa7a4c7f15e441cc8615a05d6b1311e894b045", "parents": [ "09e1396bcc0082a29dc0f87bac17e1bf12be1517" ], "author": { "name": "Alon Albert", "email": "aalbert@google.com", "time": "Wed Mar 06 16:11:46 2013 -0800" }, "committer": { "name": "Alon Albert", "email": "aalbert@google.com", "time": "Wed Mar 06 16:13:03 2013 -0800" }, "message": "Split EXDATE with a Newline Delimiter\n\nSo we can support multiple exdate values.\n\nBug: 8331334\nChange-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f\n" }, { "commit": "09e1396bcc0082a29dc0f87bac17e1bf12be1517", "tree": "15e5fce2ed5be6e9be38dd7f62e0404afe2bef79", "parents": [ "af040524481601a153b517ad2770f81e64f5ca51", "6e5eff5f9bd9ec3e2d4508e4e62b181f171688ab" ], "author": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Mon Feb 25 16:44:12 2013 -0800" }, "committer": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Mon Feb 25 16:44:12 2013 -0800" }, "message": "Merge remote-tracking branch \u0027goog/ics-ub-calendar-cream\u0027 into catchup\n" }, { "commit": "6e5eff5f9bd9ec3e2d4508e4e62b181f171688ab", "tree": "8cdc4b369aae9fc19bde908bcbafd2e02b474277", "parents": [ "0ce226da241d0089679fe37909d78bba90995810" ], "author": { "name": "Fredrik Hellén-Halme", "email": "fredrik.hellen-halme@sonyericsson.com", "time": "Thu Nov 24 10:30:48 2011 +0100" }, "committer": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Wed Feb 06 14:21:17 2013 -0800" }, "message": "Fix issue with invisible recurring appointments\n\nFixes that recurring appointments goes invisible\nwhen hit by the failsafe limit.\n\nThere is still a hard limit in RecurrenceProcessor,\nbut at least this limit is applied on a per-event\nbasis, meaning that it\u0027s always possible to create\nnew recurring appointments without them going invisible.\n\nChange-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452\n" }, { "commit": "af040524481601a153b517ad2770f81e64f5ca51", "tree": "15e5fce2ed5be6e9be38dd7f62e0404afe2bef79", "parents": [ "207e297d6911151d3e556be23ede3649beccb674", "0ce226da241d0089679fe37909d78bba90995810" ], "author": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Wed Feb 06 12:03:38 2013 -0800" }, "committer": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Wed Feb 06 12:03:38 2013 -0800" }, "message": "Merge remote-tracking branch \u0027goog/ics-ub-calendar-cream\u0027 into catchup\n" }, { "commit": "0ce226da241d0089679fe37909d78bba90995810", "tree": "180de076aab2d331087fce6be2568a3ecdbecd64", "parents": [ "504844526f1b7afec048c6d2976ffb332670d5ba" ], "author": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Thu Dec 20 16:21:56 2012 -0800" }, "committer": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Thu Dec 20 18:05:29 2012 -0800" }, "message": "Make this build in Eclipse\n\nChange-Id: Ib34de4361aaa93c5ee9d573557931f9e24905dd6\n" }, { "commit": "207e297d6911151d3e556be23ede3649beccb674", "tree": "97602eef0796d4e0aa7a5d04698b9511c3666574", "parents": [ "85066de0348723cff6687966c6a9c6f55e5b8b71" ], "author": { "name": "Fredrik Hellén-Halme", "email": "fredrik.hellen-halme@sonyericsson.com", "time": "Thu Nov 24 10:30:48 2011 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonymobile.com", "time": "Mon Nov 19 09:38:21 2012 +0100" }, "message": "Fix issue with invisible recurring appointments\n\nFixes that recurring appointments goes invisible\nwhen hit by the failsafe limit.\n\nThere is still a hard limit in RecurrenceProcessor,\nbut at least this limit is applied on a per-event\nbasis, meaning that it\u0027s always possible to create\nnew recurring appointments without them going invisible.\n\nChange-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452\n" }, { "commit": "85066de0348723cff6687966c6a9c6f55e5b8b71", "tree": "b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb", "parents": [ "0a53e6eee2628f1066e4693b52ff6bda23be9b81", "504844526f1b7afec048c6d2976ffb332670d5ba" ], "author": { "name": "Michael Chan", "email": "chanm@google.com", "time": "Thu Sep 06 14:28:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 06 14:28:44 2012 -0700" }, "message": "am 50484452: Rename calendarcommon to calendarcommon2 to workaround OEM silliness\n\n* commit \u0027504844526f1b7afec048c6d2976ffb332670d5ba\u0027:\n Rename calendarcommon to calendarcommon2 to workaround OEM silliness\n" }, { "commit": "0a53e6eee2628f1066e4693b52ff6bda23be9b81", "tree": "b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb", "parents": [ "a30f9f3ab4e0e42e02540518dd37b352257cd98d", "eb95cfa41925d2c286075236688d6473999c954e" ], "author": { "name": "Isaac Katzenelson", "email": "isaack@android.com", "time": "Thu Sep 06 14:28:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 06 14:28:44 2012 -0700" }, "message": "am eb95cfa4: (-s ours) Merge remote-tracking branch \\\u0027goog/master\\\u0027 into HEAD\n\n* commit \u0027eb95cfa41925d2c286075236688d6473999c954e\u0027:\n" }, { "commit": "a30f9f3ab4e0e42e02540518dd37b352257cd98d", "tree": "b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb", "parents": [ "06b3293d5af3454a39681cfd659271551354b8a0", "501c5d48c9b61bd981c809dacb63d06e666adc8c" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu Aug 30 13:58:51 2012 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu Aug 30 13:58:51 2012 -0700" }, "message": "Merge commit \u0027501c5d48\u0027 into manualmerge\n\nConflicts:\n\tAndroid.mk\n\nChange-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43\n" }, { "commit": "06b3293d5af3454a39681cfd659271551354b8a0", "tree": "e8c3a3165a65a6e7b907886eb09f51a545e0439a", "parents": [ "50e69cf7b39993358644988484667c0f3ce0af9e" ], "author": { "name": "Michael Chan", "email": "chanm@google.com", "time": "Tue Jun 26 17:49:56 2012 -0700" }, "committer": { "name": "Michael Chan", "email": "mchan@android.com", "time": "Wed Aug 15 07:44:23 2012 -0700" }, "message": "Rename calendarcommon to calendarcommon2 to workaround OEM silliness\n\nChange-Id: I5bd618866d6484037671376e192ee3217c42c366\n" }, { "commit": "504844526f1b7afec048c6d2976ffb332670d5ba", "tree": "a2b191e16b40c53bba7f97b37defc6962c531289", "parents": [ "eb95cfa41925d2c286075236688d6473999c954e" ], "author": { "name": "Michael Chan", "email": "chanm@google.com", "time": "Tue Jun 26 17:49:56 2012 -0700" }, "committer": { "name": "Michael Chan", "email": "chanm@google.com", "time": "Tue Jun 26 17:49:56 2012 -0700" }, "message": "Rename calendarcommon to calendarcommon2 to workaround OEM silliness\n\nChange-Id: I5bd618866d6484037671376e192ee3217c42c366\n" }, { "commit": "eb95cfa41925d2c286075236688d6473999c954e", "tree": "6d4ac5b282c860947e650272aaa8c39f981637a7", "parents": [ "501c5d48c9b61bd981c809dacb63d06e666adc8c", "50e69cf7b39993358644988484667c0f3ce0af9e" ], "author": { "name": "Isaac Katzenelson", "email": "isaack@android.com", "time": "Thu Jun 21 20:10:47 2012 -0700" }, "committer": { "name": "Isaac Katzenelson", "email": "isaack@android.com", "time": "Thu Jun 21 20:10:47 2012 -0700" }, "message": "Merge remote-tracking branch \u0027goog/master\u0027 into HEAD\n\nConflicts:\n\tAndroid.mk\n\nChange-Id: Ibf661a0b8c1d198ee01998405b81bb7919c17aaf\n" } ], "next": "50e69cf7b39993358644988484667c0f3ce0af9e" }