)]}' { "log": [ { "commit": "a6face6f3b1e70ebda646316de1ad3f8dfe1204a", "tree": "d2c78df5be7953fe5ff05c3d441f101eff6b939b", "parents": [ "59a18c530419492649a33ce6563864e21f8ef7cb" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Feb 27 17:08:40 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Feb 27 17:08:43 2025 -0800" }, "message": "[owners] Remove etancohen@google.com from rro_overlays/WifiOverlay/OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/etancohen@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: Iabf7e1cf8ac7672c42d55f2f892bb3ca7adb6749\n" }, { "commit": "59a18c530419492649a33ce6563864e21f8ef7cb", "tree": "b2c6713c8fff65ff67a54b5a7068f8b2fe5e606a", "parents": [ "68dabd1ad9b8c28062b8648e76a0f3f477c313c1" ], "author": { "name": "Nelson Li", "email": "nelsonli@google.com", "time": "Thu Dec 05 03:46:51 2024 +0000" }, "committer": { "name": "Nelson Li", "email": "nelsonli@google.com", "time": "Thu Dec 05 03:46:51 2024 +0000" }, "message": "Change TARGET_RECOVERY_UI_LIB to use fully qualified names in sunfish\n\nSince the TARGET_RECOVERY_UI_LIB for each device is not exactly the\nsame, and most of the modules in it contain `soong_namespace{}` to\navoid conflicts between different devices, after converting\n`librecovery_ui_ext` from Android.mk to Android.bp, it needs to be\nchanged to a `fully qualified name` in order to correctly use the\ncorresponding module.\n\nFlag: EXEMPT refactor\n\nBug: 339143524\nTest: m -j librecovery_ui_ext\nChange-Id: I82a1410342b13a66a21d49f400977b73fae1b744\n" }, { "commit": "68dabd1ad9b8c28062b8648e76a0f3f477c313c1", "tree": "40237541240e92fc00d8c09573418e3f76484ca2", "parents": [ "815667c60dcc56f3332e53ade7620ad91e9c21a0", "ecf67fa4b2854688b3544f332e9087d31350d0c7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:02:38 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:02:38 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I87e15ec968f59acd65e3d4bc80d1bad08704bc53\nChange-Id: I9f15b553f1d6abc7442e5fc68192f69b939bca51\n" }, { "commit": "ecf67fa4b2854688b3544f332e9087d31350d0c7", "tree": "40237541240e92fc00d8c09573418e3f76484ca2", "parents": [ "fbd7b9d65cebeca84e8c655f107b42ce0d22a68f", "815667c60dcc56f3332e53ade7620ad91e9c21a0" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 26 20:48:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 26 20:48:13 2024 +0000" }, "message": "The \"messaging\" package is being removed. am: 815667c60d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3242204\n\nChange-Id: Iedbcc5a1afcc1272df8f446d26722ca2d72c8ffc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "815667c60dcc56f3332e53ade7620ad91e9c21a0", "tree": "5fb81e0194a9468a154af4e6744ecfd446ffa43a", "parents": [ "6e0499dc52ec0e6ba0c835d9b26a3df63a891bff" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 26 16:02:49 2024 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 26 16:02:49 2024 +0000" }, "message": "The \"messaging\" package is being removed.\n\nChange-Id: Icc40999d968fe8863becc51fcdd4a4f7fd0fd4e2\n" }, { "commit": "fbd7b9d65cebeca84e8c655f107b42ce0d22a68f", "tree": "baa7d286053fd381f93ccfae454d018db60d6f63", "parents": [ "0f52ba6ff9c1e49f2b29401470ff65b7595c6646", "6e0499dc52ec0e6ba0c835d9b26a3df63a891bff" ], "author": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Wed Jul 03 01:58:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 03 01:58:02 2024 +0000" }, "message": "Remove apex.use_vndk_as_stable am: 6e0499dc52\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3156538\n\nChange-Id: Ic0fed76aba7d5de29e26d624964f693c7d621fcf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6e0499dc52ec0e6ba0c835d9b26a3df63a891bff", "tree": "bd279c1e953842d91b62a82bda0fecb0d5cf52cc", "parents": [ "f48f72d1293bc43e9733ac940d5137318d232367" ], "author": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Tue Jul 02 16:57:38 2024 +0900" }, "committer": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Tue Jul 02 16:57:38 2024 +0900" }, "message": "Remove apex.use_vndk_as_stable\n\nVNDK is gone now.\n\nBug: 350644693\nTest: m (no changes)\nChange-Id: I70107c1479e561f423df30390ffc2e4ea5e99f2d\n" }, { "commit": "0f52ba6ff9c1e49f2b29401470ff65b7595c6646", "tree": "78b3f4bac81b74c831b5ac61ad124346cdab9da2", "parents": [ "53e3d2d0e4b4a218bf358e84975ad5f4c4010435", "8d6803fcc990b96e811a9a1ca16a268d651a957d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:24 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:24 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I87e15ec968f59acd65e3d4bc80d1bad08704bc53\nChange-Id: I6db4ed3fb01277458837301fc4692ca0e4ab1e54\n" }, { "commit": "53e3d2d0e4b4a218bf358e84975ad5f4c4010435", "tree": "5517b880b3a020da9f8c24776cb734cc6c6d9ffb", "parents": [ "ff12a5c6382874612d76f93f888c0e5f534ddc0e", "f48f72d1293bc43e9733ac940d5137318d232367" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:41:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:41:35 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: f48f72d129 -s ours\n\nam skip reason: Merged-In I75b5c469fefa36289bdaa8ce7ba43d7e0506da5f with SHA-1 ff12a5c638 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3131539\n\nChange-Id: Id88e90c3d072a2ed6fae2b25137279a3a64b7ad6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f48f72d1293bc43e9733ac940d5137318d232367", "tree": "5517b880b3a020da9f8c24776cb734cc6c6d9ffb", "parents": [ "110ccdcb3fafd4ec3b7fc8f6c293f82a6f6b53b5", "ff12a5c6382874612d76f93f888c0e5f534ddc0e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:49:07 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:49:07 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: I75b5c469fefa36289bdaa8ce7ba43d7e0506da5f\nChange-Id: I0fdde3afabfdf07b537758c9fbaba8fbf0d3aef5\n" }, { "commit": "8d6803fcc990b96e811a9a1ca16a268d651a957d", "tree": "78b3f4bac81b74c831b5ac61ad124346cdab9da2", "parents": [ "9bc92b5004e905fb7f855e3f343c61ff835b753f", "ff12a5c6382874612d76f93f888c0e5f534ddc0e" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jun 11 17:30:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 11 17:30:18 2024 +0000" }, "message": "libc++fs is part of libc++ now. am: 110ccdcb3f am: ff12a5c638\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3122732\n\nChange-Id: I584a5b4457bc82918fa2c4e3aea62be595d1cb4e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ff12a5c6382874612d76f93f888c0e5f534ddc0e", "tree": "5517b880b3a020da9f8c24776cb734cc6c6d9ffb", "parents": [ "81cf147f914c45335d747e886b2ee124f7195984", "110ccdcb3fafd4ec3b7fc8f6c293f82a6f6b53b5" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jun 11 16:54:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 11 16:54:54 2024 +0000" }, "message": "libc++fs is part of libc++ now. am: 110ccdcb3f\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3122732\n\nChange-Id: I75b5c469fefa36289bdaa8ce7ba43d7e0506da5f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "110ccdcb3fafd4ec3b7fc8f6c293f82a6f6b53b5", "tree": "7de379a08db439ad91f7d554f23ec26472d2d1f7", "parents": [ "e88f5baf2f6b7ac05afa31492d07c219b5557ef8" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 10 17:37:58 2024 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 10 17:37:58 2024 +0000" }, "message": "libc++fs is part of libc++ now.\n\nChange-Id: I87945ef357e715ebfbcf7d3d08259a792b89932c\n" }, { "commit": "9bc92b5004e905fb7f855e3f343c61ff835b753f", "tree": "00fd76e22ca61278a63854abe2b78aeb5deaf689", "parents": [ "4b062d5aa25049a923e0b448788aadc126111408", "81cf147f914c45335d747e886b2ee124f7195984" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 10 12:32:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 10 12:32:09 2024 +0000" }, "message": "libc++fs is part of libc++ now. am: e88f5baf2f am: 81cf147f91\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3120472\n\nChange-Id: I02a0eb00f62c540d793088f373887c08518d272a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "81cf147f914c45335d747e886b2ee124f7195984", "tree": "c406cf22c2cebb455ef6ea94c1bf7f1e8a618360", "parents": [ "53955e46db847a081bfce45adf1704d56db56bcf", "e88f5baf2f6b7ac05afa31492d07c219b5557ef8" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jun 10 12:13:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 10 12:13:02 2024 +0000" }, "message": "libc++fs is part of libc++ now. am: e88f5baf2f\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/3120472\n\nChange-Id: Ibcbce87afeffa4ffa48d90d48d6f56e79a35bb44\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e88f5baf2f6b7ac05afa31492d07c219b5557ef8", "tree": "54ee0bfda4fb20899ab490bad693e03e3d0bba6d", "parents": [ "28655f9a45cee65d61e592e561ed2d2146a533e4" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jun 07 20:54:11 2024 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jun 07 20:54:11 2024 +0000" }, "message": "libc++fs is part of libc++ now.\n\nChange-Id: Ib6378c7e951eaa63167871c2a30761e986ffacc1\n" }, { "commit": "4b062d5aa25049a923e0b448788aadc126111408", "tree": "923ef0b792922e339ab1bbaea48a488d21ed762d", "parents": [ "46fd6346e48d67a27c618c27efd95c96434be39a", "53955e46db847a081bfce45adf1704d56db56bcf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 29 20:48:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 29 20:48:33 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 53955e46db -s ours\n\nam skip reason: Merged-In I9c1c63ca07246eed5c6eb73866ff3458cc7e0c15 with SHA-1 1663ef8a2b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/27270052\n\nChange-Id: Ib73f02e937abe4ff6dbe585aed2a1a7afaf93409\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "46fd6346e48d67a27c618c27efd95c96434be39a", "tree": "923ef0b792922e339ab1bbaea48a488d21ed762d", "parents": [ "7117ebe6ec0357caade6b0b380865bdb4e4aa205" ], "author": { "name": "Edgar Arriaga", "email": "edgararriaga@google.com", "time": "Fri May 10 00:05:31 2024 +0000" }, "committer": { "name": "Edgar Arriaga García", "email": "edgararriaga@google.com", "time": "Mon May 13 19:54:53 2024 +0000" }, "message": "Set default pin amount for home app\n\nBug: 288900050\nTest: dumpsys pinner\nFlag: EXEMPT refactor\n\nChange-Id: I87e15ec968f59acd65e3d4bc80d1bad08704bc53\n" }, { "commit": "53955e46db847a081bfce45adf1704d56db56bcf", "tree": "597f0e61dc9bff6d951751cbbfacc41467fe45a2", "parents": [ "31b8f43dbacd32c20fa886b7adda9bdd0f0e93c6", "1663ef8a2bef5810a46908e98c614f7d732d46e6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:16 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:16 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I9c1c63ca07246eed5c6eb73866ff3458cc7e0c15\nChange-Id: Ia2c410b9c864375352711519391d836f4f3eff66\n" }, { "commit": "7117ebe6ec0357caade6b0b380865bdb4e4aa205", "tree": "9b7d0b4d78acbf873a5d55abeb7b20a3d276f7f4", "parents": [ "7c441177cef9d4165a8c90bf5c2336b7c2ebe6be", "31b8f43dbacd32c20fa886b7adda9bdd0f0e93c6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:46:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:46:47 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 28655f9a45 -s ours am: 31b8f43dba -s ours\n\nam skip reason: Merged-In Ieddd2b23ca8bdd37252a7fe9b8360075ac41a754 with SHA-1 f2b4ecfbb2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2990818\n\nChange-Id: I635b2246f2b66280fc46db663829b9525d00f73f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "31b8f43dbacd32c20fa886b7adda9bdd0f0e93c6", "tree": "97b3d061ce037709caf040a31481263b23a4e54c", "parents": [ "f2b4ecfbb24ba68560cd44a5bb552512f61a690d", "28655f9a45cee65d61e592e561ed2d2146a533e4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:55:22 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:55:22 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 28655f9a45 -s ours\n\nam skip reason: Merged-In Ieddd2b23ca8bdd37252a7fe9b8360075ac41a754 with SHA-1 f2b4ecfbb2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2990818\n\nChange-Id: I1603fbf6919bbc8c74a102cd168de84e4aa2f495\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "28655f9a45cee65d61e592e561ed2d2146a533e4", "tree": "97b3d061ce037709caf040a31481263b23a4e54c", "parents": [ "7b48f2d949c0a84481aad74d119f45c1e8adc220", "f2b4ecfbb24ba68560cd44a5bb552512f61a690d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:50 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:50 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: Ieddd2b23ca8bdd37252a7fe9b8360075ac41a754\nChange-Id: I3b9135ec422e40099d8225c3358994cfc8f8b3a3\n" }, { "commit": "7c441177cef9d4165a8c90bf5c2336b7c2ebe6be", "tree": "9b7d0b4d78acbf873a5d55abeb7b20a3d276f7f4", "parents": [ "1663ef8a2bef5810a46908e98c614f7d732d46e6", "98ed40723165dd27d739d84c79afe4d1199580a8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 05 07:07:16 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 05 07:07:16 2024 +0000" }, "message": "Merge \"Update SOONG_NAMESPACES to include power-anomaly-qcril folder\" into main" }, { "commit": "1663ef8a2bef5810a46908e98c614f7d732d46e6", "tree": "597f0e61dc9bff6d951751cbbfacc41467fe45a2", "parents": [ "e8f15feba0ec2027a71ebb6c38ce056569ed9abb" ], "author": { "name": "Brad Lassey", "email": "lassey@google.com", "time": "Thu Feb 29 15:28:39 2024 +0000" }, "committer": { "name": "Brad Lassey", "email": "lassey@google.com", "time": "Thu Feb 29 20:07:45 2024 +0000" }, "message": "Enabling Observe mode\n\nBug: 327601464\nTest: Tested on local device\nChange-Id: I9c1c63ca07246eed5c6eb73866ff3458cc7e0c15\n" }, { "commit": "98ed40723165dd27d739d84c79afe4d1199580a8", "tree": "fa60fd30618bae27ec76fcc94a892471759a3cf6", "parents": [ "e8f15feba0ec2027a71ebb6c38ce056569ed9abb" ], "author": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Wed Feb 21 13:21:16 2024 +0800" }, "committer": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Thu Feb 22 16:26:49 2024 +0800" }, "message": "Update SOONG_NAMESPACES to include power-anomaly-qcril folder\n\nBug: 325989157\nTest: m PowerAnomalyQcril\nChange-Id: I6691ff46f94c5da6447d02333df925627197855d\n" }, { "commit": "e8f15feba0ec2027a71ebb6c38ce056569ed9abb", "tree": "97b3d061ce037709caf040a31481263b23a4e54c", "parents": [ "444da493037b733b43261c934ec66842a3f464c6", "f2b4ecfbb24ba68560cd44a5bb552512f61a690d" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Tue Feb 13 00:00:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 00:00:30 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model am: 7b48f2d949 am: f2b4ecfbb2\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2944253\n\nChange-Id: Ib30fd7c36adda325a2379ec654ac1e49a7ce20e7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2b4ecfbb24ba68560cd44a5bb552512f61a690d", "tree": "97b3d061ce037709caf040a31481263b23a4e54c", "parents": [ "9d4f2cb16337e136edde1140f08bc14163a10c4c", "7b48f2d949c0a84481aad74d119f45c1e8adc220" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Mon Feb 12 23:21:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 12 23:21:12 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model am: 7b48f2d949\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2944253\n\nChange-Id: Ieddd2b23ca8bdd37252a7fe9b8360075ac41a754\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7b48f2d949c0a84481aad74d119f45c1e8adc220", "tree": "ced5bd6637b67ed45b19c58383f097e458c32d30", "parents": [ "8245ab63b50a412741a2b3581ca3a8023e1448b3" ], "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: If679269a3f7f22ee74b7280ca8f3bf877bf0658d\n" }, { "commit": "444da493037b733b43261c934ec66842a3f464c6", "tree": "e8d074f11bf64932cac3f88d88d5db04c84f918a", "parents": [ "bdb2183763a2ea570bf325efa0eea82569fdb47a", "9d4f2cb16337e136edde1140f08bc14163a10c4c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:02:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:02:55 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 9d4f2cb163 -s ours\n\nam skip reason: Merged-In I9028f8eae1d973d0f9b7553a6adf9525b56766c9 with SHA-1 34acb968a5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/25973321\n\nChange-Id: I5d978b27f90729df1a5f954a2f9558bb48811f83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9d4f2cb16337e136edde1140f08bc14163a10c4c", "tree": "e8d074f11bf64932cac3f88d88d5db04c84f918a", "parents": [ "23d9fcf9b3f34eab5140b32e4255c7594aa5489a", "bdb2183763a2ea570bf325efa0eea82569fdb47a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:13:14 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:13:14 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I9028f8eae1d973d0f9b7553a6adf9525b56766c9\nChange-Id: I46b3d8fe6840571221df2479591cf7800382c8a1\n" }, { "commit": "bdb2183763a2ea570bf325efa0eea82569fdb47a", "tree": "e8d074f11bf64932cac3f88d88d5db04c84f918a", "parents": [ "6c0a502ba87995126c9c0b7a4eeabf68b5c2d074", "1813a585843f256cb305dde56119abd41f75af66" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 23:23:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 23:23:23 2023 +0000" }, "message": "[automerger skipped] Merge \"Revert^2 \"sunfish: Replace NFC app with NFC apex\"\" into main am: 8245ab63b5 am: 23d9fcf9b3 am: 1813a58584 -s ours\n\nam skip reason: Merged-In Ib899388df166a2178d0e7c361c945122d5a82841 with SHA-1 1ec0335ffd is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587\n\nChange-Id: I9241f7ad20e451e859fe29f9b33d400f2117e2ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c0a502ba87995126c9c0b7a4eeabf68b5c2d074", "tree": "e8d074f11bf64932cac3f88d88d5db04c84f918a", "parents": [ "9767f64f984b3cde965664c2f37fa9f7fca791f2", "f8185522010b90f35ed71a6ad91ee3a02c2af659" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 23:23:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 23:23:05 2023 +0000" }, "message": "[automerger skipped] Merge \"Revert^2 \"sunfish(nfc): Modify NFC overlays for NFC apex\"\" into main am: 13abc9695d am: 7801f47575 am: f818552201 -s ours\n\nam skip reason: Merged-In I9028f8eae1d973d0f9b7553a6adf9525b56766c9 with SHA-1 34acb968a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088\n\nChange-Id: Id2dedc0d627b894f103c818d12f74a429252fe0a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9767f64f984b3cde965664c2f37fa9f7fca791f2", "tree": "e8d074f11bf64932cac3f88d88d5db04c84f918a", "parents": [ "34acb968a58e4aefa003cc00fc20699d6d66a0cd", "b86d75251923e388ab7011452e9155eb12fbedab" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:57:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:57:54 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours am: 2c904e7206 -s ours am: b86d752519 -s ours\n\nam skip reason: Merged-In I405116d274cfcba81fa0be1aa330b13bd1bef64d with SHA-1 4f9c0920e5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2866414\n\nChange-Id: Iae1e301c85f5a5c62cb38bcde6e107011e1ab014\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1813a585843f256cb305dde56119abd41f75af66", "tree": "467da4817e147dbc6e3467d8b0f5033779cefdc1", "parents": [ "f8185522010b90f35ed71a6ad91ee3a02c2af659", "23d9fcf9b3f34eab5140b32e4255c7594aa5489a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 22:40:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:40:19 2023 +0000" }, "message": "Merge \"Revert^2 \"sunfish: Replace NFC app with NFC apex\"\" into main am: 8245ab63b5 am: 23d9fcf9b3\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587\n\nChange-Id: I045e2917ffef96b052fb67c06fb57fdc550488c6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8185522010b90f35ed71a6ad91ee3a02c2af659", "tree": "79faa4cebe4eb351bfce50c8833248b3d26a0abe", "parents": [ "b86d75251923e388ab7011452e9155eb12fbedab", "7801f4757591a22a8073162aaaa11f30a18eedce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 22:40:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:40:05 2023 +0000" }, "message": "Merge \"Revert^2 \"sunfish(nfc): Modify NFC overlays for NFC apex\"\" into main am: 13abc9695d am: 7801f47575\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088\n\nChange-Id: I2be4ba253d38574ec5824910c3a73f557e6302e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "23d9fcf9b3f34eab5140b32e4255c7594aa5489a", "tree": "467da4817e147dbc6e3467d8b0f5033779cefdc1", "parents": [ "7801f4757591a22a8073162aaaa11f30a18eedce", "8245ab63b50a412741a2b3581ca3a8023e1448b3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 22:18:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:18:25 2023 +0000" }, "message": "Merge \"Revert^2 \"sunfish: Replace NFC app with NFC apex\"\" into main am: 8245ab63b5\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587\n\nChange-Id: Iab4ff24b18973cd8cbdeade47f4273d6cee9bbde\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7801f4757591a22a8073162aaaa11f30a18eedce", "tree": "79faa4cebe4eb351bfce50c8833248b3d26a0abe", "parents": [ "2c904e7206bf7a25f393e2106930e1d4033ca43b", "13abc9695d23cfa7f48add0f9faedc2c3e2ff6dc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 22:18:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:18:10 2023 +0000" }, "message": "Merge \"Revert^2 \"sunfish(nfc): Modify NFC overlays for NFC apex\"\" into main am: 13abc9695d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088\n\nChange-Id: I9a0c21df4fc6d054ed7a5d7fc29ccb2480508112\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b86d75251923e388ab7011452e9155eb12fbedab", "tree": "275d6e3aaf06731fb11c55e02e572f624611d618", "parents": [ "19bbb00fba38449fb9951828f4c76d615a1ad56a", "2c904e7206bf7a25f393e2106930e1d4033ca43b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:02:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:02:42 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours am: 2c904e7206 -s ours\n\nam skip reason: Merged-In I405116d274cfcba81fa0be1aa330b13bd1bef64d with SHA-1 4f9c0920e5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2866414\n\nChange-Id: Ibca993fcf766178f06de53b6a3a5ee55405c35cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8245ab63b50a412741a2b3581ca3a8023e1448b3", "tree": "467da4817e147dbc6e3467d8b0f5033779cefdc1", "parents": [ "13abc9695d23cfa7f48add0f9faedc2c3e2ff6dc", "9f1be47cfd8e1c23779dc994e2057b06751c62be" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 22:00:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 22:00:35 2023 +0000" }, "message": "Merge \"Revert^2 \"sunfish: Replace NFC app with NFC apex\"\" into main" }, { "commit": "13abc9695d23cfa7f48add0f9faedc2c3e2ff6dc", "tree": "79faa4cebe4eb351bfce50c8833248b3d26a0abe", "parents": [ "61a7265d39bf11f9191e5bc0ca1e5c8e31407a88", "8b110344775ee58d4a7b2e3894b1c9db34ae418d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 11 22:00:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 22:00:35 2023 +0000" }, "message": "Merge \"Revert^2 \"sunfish(nfc): Modify NFC overlays for NFC apex\"\" into main" }, { "commit": "2c904e7206bf7a25f393e2106930e1d4033ca43b", "tree": "275d6e3aaf06731fb11c55e02e572f624611d618", "parents": [ "4f9c0920e553f39fe7d209d323f1a75eb82ca6d1", "61a7265d39bf11f9191e5bc0ca1e5c8e31407a88" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:16:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:16:52 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours\n\nam skip reason: Merged-In I405116d274cfcba81fa0be1aa330b13bd1bef64d with SHA-1 4f9c0920e5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2866414\n\nChange-Id: Ica0023a3fc5ab718c0389788c8ca95c4d4a5bf6a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "61a7265d39bf11f9191e5bc0ca1e5c8e31407a88", "tree": "275d6e3aaf06731fb11c55e02e572f624611d618", "parents": [ "c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7", "4f9c0920e553f39fe7d209d323f1a75eb82ca6d1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:13:48 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:13:48 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: I405116d274cfcba81fa0be1aa330b13bd1bef64d\nBug: 315507370\nChange-Id: Ie13b9ee1ce67642bf088961f0b0e5367d21e39c5\n" }, { "commit": "8b110344775ee58d4a7b2e3894b1c9db34ae418d", "tree": "46def9a88b87c3e5d8912554e97aef57784de450", "parents": [ "c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Dec 06 21:32:54 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 06 21:32:54 2023 +0000" }, "message": "Revert^2 \"sunfish(nfc): Modify NFC overlays for NFC apex\"\n\n0ba612f27f56cabafb15efb78adfca8e565486a0\n\nBug: 303286040\nTest: Compiles\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34acb968a58e4aefa003cc00fc20699d6d66a0cd)\nMerged-In: I9028f8eae1d973d0f9b7553a6adf9525b56766c9\nChange-Id: I9028f8eae1d973d0f9b7553a6adf9525b56766c9\n" }, { "commit": "9f1be47cfd8e1c23779dc994e2057b06751c62be", "tree": "37446a1a78f29a7a6d23a33436d6a2da412cacac", "parents": [ "c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Dec 06 21:32:48 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 06 21:32:48 2023 +0000" }, "message": "Revert^2 \"sunfish: Replace NFC app with NFC apex\"\n\ned69a7cc8c2f30a8f375f7fa8c781796e98fb399\n\nBug: 303286040\nTest: Compiles\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ec0335ffd1a01f4f74a74cdc167e4b976d35d71)\nMerged-In: Ib899388df166a2178d0e7c361c945122d5a82841\nChange-Id: Ib899388df166a2178d0e7c361c945122d5a82841\n" }, { "commit": "34acb968a58e4aefa003cc00fc20699d6d66a0cd", "tree": "e8d074f11bf64932cac3f88d88d5db04c84f918a", "parents": [ "1ec0335ffd1a01f4f74a74cdc167e4b976d35d71" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Dec 01 19:19:56 2023 +0000" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Dec 04 13:50:13 2023 -0800" }, "message": "Revert^2 \"sunfish(nfc): Modify NFC overlays for NFC apex\"\n\n0ba612f27f56cabafb15efb78adfca8e565486a0\n\nBug: 303286040\nTest: Compiles\n\nChange-Id: I9028f8eae1d973d0f9b7553a6adf9525b56766c9\n" }, { "commit": "1ec0335ffd1a01f4f74a74cdc167e4b976d35d71", "tree": "860ce82e0da58cac87c1e23a3e39349cf38973a5", "parents": [ "ff8952008e2790375cb473332f6501c4c3857264" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Dec 01 19:19:56 2023 +0000" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Dec 04 11:36:03 2023 -0800" }, "message": "Revert^2 \"sunfish: Replace NFC app with NFC apex\"\n\ned69a7cc8c2f30a8f375f7fa8c781796e98fb399\n\nBug: 303286040\nTest: Compiles\n\nChange-Id: Ib899388df166a2178d0e7c361c945122d5a82841\n" }, { "commit": "ff8952008e2790375cb473332f6501c4c3857264", "tree": "3fd7feb20be5304117543ca28548a005c4241b11", "parents": [ "35ba40aae994bdf56509668d8153986a92a5901e", "19bbb00fba38449fb9951828f4c76d615a1ad56a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 04:36:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 04:36:35 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main am: c67c23d7ef am: 0c777425e6 am: 19bbb00fba\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754\n\nChange-Id: I06b9bd69b34f65f966b1cf866119aec9e0a4857e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "35ba40aae994bdf56509668d8153986a92a5901e", "tree": "3fd7feb20be5304117543ca28548a005c4241b11", "parents": [ "341c9c3dde4774783450a915402ad3419bc6e435", "8744bf9f04f6ed1335dbaf122bf978363dbd4b6d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 04:36:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 04:36:22 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main am: c67c23d7ef am: 4f9c0920e5 am: 8744bf9f04\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754\n\nChange-Id: I26d9985515737ceda915f6c46aacf63b35a384ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19bbb00fba38449fb9951828f4c76d615a1ad56a", "tree": "275d6e3aaf06731fb11c55e02e572f624611d618", "parents": [ "8744bf9f04f6ed1335dbaf122bf978363dbd4b6d", "0c777425e693e7a888e7b050a97cb91474d4f2d6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 04:04:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 04:04:57 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main am: c67c23d7ef am: 0c777425e6\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754\n\nChange-Id: Iee9bdbc60cc559e381b097f1fba1fbb3722f83f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8744bf9f04f6ed1335dbaf122bf978363dbd4b6d", "tree": "275d6e3aaf06731fb11c55e02e572f624611d618", "parents": [ "648a5fb7be5cccc849d9c052cb1d176f214ffb79", "4f9c0920e553f39fe7d209d323f1a75eb82ca6d1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 04:03:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 04:03:02 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main am: c67c23d7ef am: 4f9c0920e5\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754\n\nChange-Id: Ife1530474aba775150d8ab0bcafdc9e1c8a84410\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4f9c0920e553f39fe7d209d323f1a75eb82ca6d1", "tree": "275d6e3aaf06731fb11c55e02e572f624611d618", "parents": [ "44a1cb332cf00e9e68918ecda61c4ced6c190846", "c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 03:30:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 03:30:24 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main am: c67c23d7ef\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754\n\nChange-Id: I405116d274cfcba81fa0be1aa330b13bd1bef64d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c777425e693e7a888e7b050a97cb91474d4f2d6", "tree": "295b6338dda891121b359dbe1f762672db8a0601", "parents": [ "f1bb321d999719b8acba7f8dc5ab1d1ad39e35ec", "c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 03:30:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 03:30:24 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main am: c67c23d7ef\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754\n\nChange-Id: I2d5a18693ceaeb64aa7600495b978d052d0a65b9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7", "tree": "71f938998cbd0dc82408332aa9e8df7fc3f0930c", "parents": [ "3bb396285dca8e35382300f3f773ece5dd81f082", "971eaca91c3e3abe6f03357a4e0b3dd256774ddd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 17 03:01:03 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 17 03:01:03 2023 +0000" }, "message": "Merge \"Remove unused Android.mk under device/google/sunfish\" into main" }, { "commit": "341c9c3dde4774783450a915402ad3419bc6e435", "tree": "ae465d44e75838ba0c65456c05afff437b1e1289", "parents": [ "4c70701543d7127962dbe30b98d43b87c1de2ec6" ], "author": { "name": "Jack Wu", "email": "wjack@google.com", "time": "Fri Nov 10 20:02:10 2023 +0800" }, "committer": { "name": "Jack Wu", "email": "wjack@google.com", "time": "Sat Nov 11 03:37:00 2023 +0000" }, "message": "sunfish: update AIDL IGoogleBattery manifest version to 3\n\nBug: 309518527\nTest: TH\nChange-Id: Ic00cdf376feacfdbc9494c49cd421cd7fd581364\nSigned-off-by: Jack Wu \u003cwjack@google.com\u003e\n" }, { "commit": "971eaca91c3e3abe6f03357a4e0b3dd256774ddd", "tree": "d16715641f75f936d9800d68a00107ddd8ec443f", "parents": [ "7bd75e7d4c5e594285e62b6129b120b0b2a93add" ], "author": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Fri Nov 10 15:26:27 2023 +0800" }, "committer": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Fri Nov 10 15:28:48 2023 +0800" }, "message": "Remove unused Android.mk under device/google/sunfish\n\nThe sunfish device is deprecated.\n\nBug: 310105129\nTest: NA\nChange-Id: I30c40ed83c41aceb2bfbfde5cd1e02e740d79ec1\n" }, { "commit": "4c70701543d7127962dbe30b98d43b87c1de2ec6", "tree": "b0cb4e2ba57e4422afe66aa9a029a1651958ed2e", "parents": [ "2727145e367cce757b0fc9d8b6b514d6a3300526", "648a5fb7be5cccc849d9c052cb1d176f214ffb79" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 23:34:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 23:34:40 2023 +0000" }, "message": "[automerger skipped] Merge changes from topic \"nfc_apex_revert\" into main am: 3bb396285d am: f1bb321d99 -s ours am: 648a5fb7be -s ours\n\nam skip reason: Merged-In I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 with SHA-1 743272dd7e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634\n\nChange-Id: Id1fdf23d2be6588b96b80751dec8957e3ba4e388\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2727145e367cce757b0fc9d8b6b514d6a3300526", "tree": "b0cb4e2ba57e4422afe66aa9a029a1651958ed2e", "parents": [ "947a7d7777619cea1152a5a909cb82fe1923ba8a", "60bcab5932cee51f44166b8f7ae482c3851af0e8" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 23:34:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 23:34:22 2023 +0000" }, "message": "[automerger skipped] Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\" am: 3110a92da8 am: ad4186371b am: 60bcab5932 -s ours\n\nam skip reason: Merged-In Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400 with SHA-1 0ba612f27f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131\n\nChange-Id: If60b3f30fcf33983893c7fe0f7fb76db31602e88\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "947a7d7777619cea1152a5a909cb82fe1923ba8a", "tree": "b0cb4e2ba57e4422afe66aa9a029a1651958ed2e", "parents": [ "2f2d481acf97700b96d9730b8f7ce83dc9626652", "50a8795fd53dc9a326fbf0088ce553e4e53d9e6a" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 23:30:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 23:30:51 2023 +0000" }, "message": "[automerger skipped] Merge changes from topic \"nfc_apex_revert\" into main am: 3bb396285d am: 44a1cb332c am: 50a8795fd5 -s ours\n\nam skip reason: Merged-In I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 with SHA-1 ed69a7cc8c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634\n\nChange-Id: Icb459820165029dedfe1995c917221acaa6cfbf8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2f2d481acf97700b96d9730b8f7ce83dc9626652", "tree": "b0cb4e2ba57e4422afe66aa9a029a1651958ed2e", "parents": [ "a1013fa9e873e54bfd4a14ff03859a88d0e8a2c5", "3dfc560df06d6b9d2a0adcb66cb6050327213733" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 23:30:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 23:30:35 2023 +0000" }, "message": "[automerger skipped] Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\" am: 3110a92da8 am: b566fce5ba am: 3dfc560df0 -s ours\n\nam skip reason: Merged-In Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400 with SHA-1 0ba612f27f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131\n\nChange-Id: I6f0d429fd740faf017c4f701ee87397013191f48\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "648a5fb7be5cccc849d9c052cb1d176f214ffb79", "tree": "94d813b75bf08824d5474323be618495f53891fc", "parents": [ "60bcab5932cee51f44166b8f7ae482c3851af0e8", "f1bb321d999719b8acba7f8dc5ab1d1ad39e35ec" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 22:48:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 22:48:57 2023 +0000" }, "message": "[automerger skipped] Merge changes from topic \"nfc_apex_revert\" into main am: 3bb396285d am: f1bb321d99 -s ours\n\nam skip reason: Merged-In I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 with SHA-1 743272dd7e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634\n\nChange-Id: I6088b32e2c659964fcdba629347e342b16924e65\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "60bcab5932cee51f44166b8f7ae482c3851af0e8", "tree": "94d813b75bf08824d5474323be618495f53891fc", "parents": [ "50a8795fd53dc9a326fbf0088ce553e4e53d9e6a", "ad4186371bae184b558915d2ea39a4c0f176def8" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 22:48:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 22:48:40 2023 +0000" }, "message": "Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\" am: 3110a92da8 am: ad4186371b\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131\n\nChange-Id: Ibbf1fd2c0b31d542dbc01f8811246cb7211a03fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50a8795fd53dc9a326fbf0088ce553e4e53d9e6a", "tree": "94d813b75bf08824d5474323be618495f53891fc", "parents": [ "3dfc560df06d6b9d2a0adcb66cb6050327213733", "44a1cb332cf00e9e68918ecda61c4ced6c190846" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 22:46:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 22:46:23 2023 +0000" }, "message": "Merge changes from topic \"nfc_apex_revert\" into main am: 3bb396285d am: 44a1cb332c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634\n\nChange-Id: I540cf027cc06f530d81b1bad7d3a4c9d56430620\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3dfc560df06d6b9d2a0adcb66cb6050327213733", "tree": "a89d7271acef13b250efed3a927c19f0c2a3bf10", "parents": [ "2cb2e3cb5c07e080161ae1592a07f51fd09f62e1", "b566fce5bab86346ae08dcc31da1f2521f6725f7" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 22:46:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 22:46:05 2023 +0000" }, "message": "Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\" am: 3110a92da8 am: b566fce5ba\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131\n\nChange-Id: I20906cbd0dc599c8adeaadb237a6182a08d0efc3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f1bb321d999719b8acba7f8dc5ab1d1ad39e35ec", "tree": "88256e29a69c861e598bc9645cdc6448177a9a00", "parents": [ "ad4186371bae184b558915d2ea39a4c0f176def8", "3bb396285dca8e35382300f3f773ece5dd81f082" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 21:49:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 21:49:10 2023 +0000" }, "message": "Merge changes from topic \"nfc_apex_revert\" into main am: 3bb396285d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634\n\nChange-Id: I571e1928220b7ec639f691df52d12c61a02655be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad4186371bae184b558915d2ea39a4c0f176def8", "tree": "13b092efd5492a535fbebcc3307522976b7f8ba6", "parents": [ "0e0515b78a76765b1faee27f5cd9d6e9c43c70a8", "3110a92da8c20aa4fb64aff86c52bd0ff5d90f85" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 21:48:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 21:48:53 2023 +0000" }, "message": "Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\" am: 3110a92da8\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131\n\nChange-Id: I3bfee78e653a4e947a3039a7c7fdcc222518cb9b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "44a1cb332cf00e9e68918ecda61c4ced6c190846", "tree": "94d813b75bf08824d5474323be618495f53891fc", "parents": [ "b566fce5bab86346ae08dcc31da1f2521f6725f7", "3bb396285dca8e35382300f3f773ece5dd81f082" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 21:45:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 21:45:44 2023 +0000" }, "message": "Merge changes from topic \"nfc_apex_revert\" into main am: 3bb396285d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634\n\nChange-Id: Ibb4a4354735386accf25471bdb4b76ae481f6d8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b566fce5bab86346ae08dcc31da1f2521f6725f7", "tree": "a89d7271acef13b250efed3a927c19f0c2a3bf10", "parents": [ "0004f886246032e117ecb1b835325483a7f761f1", "3110a92da8c20aa4fb64aff86c52bd0ff5d90f85" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 21:45:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 08 21:45:25 2023 +0000" }, "message": "Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\" am: 3110a92da8\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131\n\nChange-Id: I134717ab19ce96f1f482b2c5ba41e791a01286f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3bb396285dca8e35382300f3f773ece5dd81f082", "tree": "b09c39453c47ef2a3cf4c6d62c7f82dd265bd32c", "parents": [ "7bd75e7d4c5e594285e62b6129b120b0b2a93add", "743272dd7e10bddf70b236a95bce8d123ad040a0" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Nov 08 21:16:19 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 08 21:16:19 2023 +0000" }, "message": "Merge changes from topic \"nfc_apex_revert\" into main\n\n* changes:\n Revert \"sunfish: Replace NFC app with NFC apex\"\n Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\"\n" }, { "commit": "743272dd7e10bddf70b236a95bce8d123ad040a0", "tree": "0d2b2ce6dc62dfaa20d6e4ae6da91ae3542c9018", "parents": [ "3110a92da8c20aa4fb64aff86c52bd0ff5d90f85" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 06 19:37:37 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue Nov 07 04:01:50 2023 +0000" }, "message": "Revert \"sunfish: Replace NFC app with NFC apex\"\n\nRevert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056\n\nReason for revert: Causing bootloop with signed builds\n\nReverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056\n\nBug: 309117462\nTest: Compiles, device boots up\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed69a7cc8c2f30a8f375f7fa8c781796e98fb399)\nMerged-In: I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9\nChange-Id: I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9\n" }, { "commit": "3110a92da8c20aa4fb64aff86c52bd0ff5d90f85", "tree": "888b91fa7c41a7720b6052547e07af98572ba0f4", "parents": [ "b327df812c2207cb48f0acf55111c7387f5c6d82" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Sat Nov 04 18:59:20 2023 +0000" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 06 19:46:35 2023 +0000" }, "message": "Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\"\n\nRevert submission 2802548-nfc_apex\n\nReason for revert: Causing bootloop with signed builds\n\nReverted changes: /q/submissionid:2802548-nfc_apex\n\nBug: 309117462\nTest: Compiles, device boots up\nMerged-In: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400\nChange-Id: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400\n" }, { "commit": "a1013fa9e873e54bfd4a14ff03859a88d0e8a2c5", "tree": "b0cb4e2ba57e4422afe66aa9a029a1651958ed2e", "parents": [ "0ba612f27f56cabafb15efb78adfca8e565486a0", "ed69a7cc8c2f30a8f375f7fa8c781796e98fb399" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Nov 06 14:31:02 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 06 14:31:02 2023 +0000" }, "message": "Merge \"Revert \"sunfish: Replace NFC app with NFC apex\"\" into main" }, { "commit": "0ba612f27f56cabafb15efb78adfca8e565486a0", "tree": "4a51b0d0db3fd0c1e1396b21492d0901cae690f2", "parents": [ "25ed58c6f7488bf8dd105b735507ab87c3d4344c" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Sat Nov 04 19:05:18 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Sat Nov 04 19:05:18 2023 +0000" }, "message": "Revert \"sunfish(nfc): Modify NFC overlays for NFC apex\"\n\nRevert submission 2802548-nfc_apex\n\nReason for revert: Causing bootloop with signed builds\n\nReverted changes: /q/submissionid:2802548-nfc_apex\n\nBug: 309117462\nTest: Compiles, device boots up\n(cherry picked from https://android-review.googlesource.com/q/commit:2be48f06bdcc55d3951cd02c51e004de3b82b566)\nMerged-In: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400\nChange-Id: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400\n" }, { "commit": "ed69a7cc8c2f30a8f375f7fa8c781796e98fb399", "tree": "42920af766c1c56a0b015d2915e6b58426ac6d90", "parents": [ "dda22ca2167f2bc589f4b76a599675047fdeb8d8" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Sat Nov 04 14:58:26 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 04 14:59:31 2023 +0000" }, "message": "Revert \"sunfish: Replace NFC app with NFC apex\"\n\nRevert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056\n\nReason for revert: Causing bootloop with signed builds\n\nReverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056\n\nBug: 309117462\nChange-Id: I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9\nTest: Compiles, device boots up\n" }, { "commit": "25ed58c6f7488bf8dd105b735507ab87c3d4344c", "tree": "ba482f6a0372585adedc6edf79c71b0328c38bf9", "parents": [ "fe617371d08f204d8b056b49f623980346affb04", "2cb2e3cb5c07e080161ae1592a07f51fd09f62e1" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 00:16:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 00:16:01 2023 +0000" }, "message": "[automerger skipped] Fix lunch choices for git_main am: 7bd75e7d4c am: 0e0515b78a -s ours am: 2cb2e3cb5c -s ours\n\nam skip reason: Merged-In Iea130f47cae15528eed6cde5e7f8997baecc9fdf with SHA-1 7bd75e7d4c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2811081\n\nChange-Id: I0b160de1455d457cb578d66f7d41ab859b952941\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe617371d08f204d8b056b49f623980346affb04", "tree": "ba482f6a0372585adedc6edf79c71b0328c38bf9", "parents": [ "eefecb993b0a56c9e52dae6210742536f86eb40e", "b7c4680059a09da10c07055acefc7edf65a78caa" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 00:14:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 00:14:25 2023 +0000" }, "message": "[automerger skipped] Fix lunch choices for git_main am: 7bd75e7d4c am: 0004f88624 am: b7c4680059 -s ours\n\nam skip reason: Merged-In Iea130f47cae15528eed6cde5e7f8997baecc9fdf with SHA-1 edf548b215 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2811081\n\nChange-Id: I806000051c3564f3bedc38deba55bba539538412\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2cb2e3cb5c07e080161ae1592a07f51fd09f62e1", "tree": "2bbf1c8d9dbb3346907ac5a2c7d51475990b06a1", "parents": [ "b7c4680059a09da10c07055acefc7edf65a78caa", "0e0515b78a76765b1faee27f5cd9d6e9c43c70a8" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 23:36:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 30 23:36:44 2023 +0000" }, "message": "[automerger skipped] Fix lunch choices for git_main am: 7bd75e7d4c am: 0e0515b78a -s ours\n\nam skip reason: Merged-In Iea130f47cae15528eed6cde5e7f8997baecc9fdf with SHA-1 7bd75e7d4c is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2811081\n\nChange-Id: Iddba10f4f075916d640c8b9823b36718e6cdb79f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b7c4680059a09da10c07055acefc7edf65a78caa", "tree": "2bbf1c8d9dbb3346907ac5a2c7d51475990b06a1", "parents": [ "faed57b3ec743183c69003a0e1eab4f7971c061c", "0004f886246032e117ecb1b835325483a7f761f1" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 23:35:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 30 23:35:32 2023 +0000" }, "message": "Fix lunch choices for git_main am: 7bd75e7d4c am: 0004f88624\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2811081\n\nChange-Id: Ia4e9994d1f35a481aaa64a5102481969a20e4be5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e0515b78a76765b1faee27f5cd9d6e9c43c70a8", "tree": "a40bc8ef25147b918a2d9a1bb55034973d08fec4", "parents": [ "2db03b2f2f3e1bae5171f4c21a33a6435afd523c", "7bd75e7d4c5e594285e62b6129b120b0b2a93add" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 23:10:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 30 23:10:02 2023 +0000" }, "message": "Fix lunch choices for git_main am: 7bd75e7d4c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2811081\n\nChange-Id: If5884d0af01ece18da424446cdd0be39f0be75cc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0004f886246032e117ecb1b835325483a7f761f1", "tree": "2bbf1c8d9dbb3346907ac5a2c7d51475990b06a1", "parents": [ "75f5a2e3b04c4a29dbe18ca98868fd5787f9b58e", "7bd75e7d4c5e594285e62b6129b120b0b2a93add" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 23:08:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 30 23:08:46 2023 +0000" }, "message": "Fix lunch choices for git_main am: 7bd75e7d4c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2811081\n\nChange-Id: I80c9fffeb99c31bd1ed332ddfe14a8a82ba7a1e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7bd75e7d4c5e594285e62b6129b120b0b2a93add", "tree": "6b849b0c6843e9caaa44e9e7f34ad868181f696f", "parents": [ "b327df812c2207cb48f0acf55111c7387f5c6d82" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Mon Oct 30 22:01:13 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Oct 30 22:01:13 2023 +0000" }, "message": "Fix lunch choices for git_main\n\nWe add \"trunk_staging-\" for all COMMON_LUNCH_CHOICES so they are\nvalid in the trunk stable setup.\n\nBug: 307738446\nTest: lunch\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:edf548b215c6a1bdd4903bbfc48eab9388e25d51)\nMerged-In: Iea130f47cae15528eed6cde5e7f8997baecc9fdf\nChange-Id: Iea130f47cae15528eed6cde5e7f8997baecc9fdf\n" }, { "commit": "eefecb993b0a56c9e52dae6210742536f86eb40e", "tree": "ba482f6a0372585adedc6edf79c71b0328c38bf9", "parents": [ "7403d2bd58195bba3b4046d0ba35c729aeece298", "faed57b3ec743183c69003a0e1eab4f7971c061c" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 26 15:30:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 15:30:23 2023 +0000" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex am: b327df812c am: 2db03b2f2f am: faed57b3ec\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2802648\n\nChange-Id: I61db3d2b0cf1858831a68e816c52aece02856bf0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7403d2bd58195bba3b4046d0ba35c729aeece298", "tree": "ba482f6a0372585adedc6edf79c71b0328c38bf9", "parents": [ "edf548b215c6a1bdd4903bbfc48eab9388e25d51", "fe20ac854ef24733eb8451b154b003744ffee0c9" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 26 15:29:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 15:29:08 2023 +0000" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex am: b327df812c am: 75f5a2e3b0 am: fe20ac854e\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2802648\n\nChange-Id: I6e1ede900aeb68f8ba2f85e2d73c0eb1237f77e2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "faed57b3ec743183c69003a0e1eab4f7971c061c", "tree": "3eb33bec2dbcae8ccad504f58b0505a754b6702c", "parents": [ "fe20ac854ef24733eb8451b154b003744ffee0c9", "2db03b2f2f3e1bae5171f4c21a33a6435afd523c" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 26 14:58:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 14:58:36 2023 +0000" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex am: b327df812c am: 2db03b2f2f\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2802648\n\nChange-Id: Ifc1f177fc08c4855bfeb89a78a086fa0cbbaad1d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe20ac854ef24733eb8451b154b003744ffee0c9", "tree": "3eb33bec2dbcae8ccad504f58b0505a754b6702c", "parents": [ "8440f04eddb4d1573649e3291213d730cdf75a70", "75f5a2e3b04c4a29dbe18ca98868fd5787f9b58e" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 26 14:57:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 14:57:10 2023 +0000" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex am: b327df812c am: 75f5a2e3b0\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2802648\n\nChange-Id: I3051f88fd758440baae3327e828e17ad09bcf4a4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2db03b2f2f3e1bae5171f4c21a33a6435afd523c", "tree": "3a946c7502fa208e4f133a46867d2e3b6bddb925", "parents": [ "b73fc3360d4f5e450a0de50d1f0023fe855f8389", "b327df812c2207cb48f0acf55111c7387f5c6d82" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 26 14:35:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 14:35:53 2023 +0000" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex am: b327df812c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2802648\n\nChange-Id: I50d27f8fac0ab2af7e8270d2d9dacfe6d418ab8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75f5a2e3b04c4a29dbe18ca98868fd5787f9b58e", "tree": "3eb33bec2dbcae8ccad504f58b0505a754b6702c", "parents": [ "577a2de0a1d490d34172d9c91314efc757223c83", "b327df812c2207cb48f0acf55111c7387f5c6d82" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Oct 26 14:33:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 14:33:58 2023 +0000" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex am: b327df812c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2802648\n\nChange-Id: Id908ec0c1c467f9736c5c699d5b28f95188fa54d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b327df812c2207cb48f0acf55111c7387f5c6d82", "tree": "d2b3466863f54295fa1df3fdf3c2f4688d5c030a", "parents": [ "a3c8cd657e13050d671f1b218b59087cac865b9a" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Oct 25 14:04:45 2023 -0700" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Oct 25 14:05:55 2023 -0700" }, "message": "sunfish(nfc): Modify NFC overlays for NFC apex\n\nBug: 307763519\nTest: Manual flash and tested the overlay values are taking effect.\nChange-Id: I65bee951f7ac18312fc1ccddc0e20463ae6b89e5\n" }, { "commit": "edf548b215c6a1bdd4903bbfc48eab9388e25d51", "tree": "4a51b0d0db3fd0c1e1396b21492d0901cae690f2", "parents": [ "6c169f50f2dbde04d7f5c8a2a55e49666f41285e" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Oct 25 14:33:28 2023 -0600" }, "committer": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Oct 25 14:33:28 2023 -0600" }, "message": "Fix lunch choices for git_main\n\nWe add \"trunk_staging-\" for all COMMON_LUNCH_CHOICES so they are\nvalid in the trunk stable setup.\n\nBug: 307738446\nTest: lunch\nChange-Id: Iea130f47cae15528eed6cde5e7f8997baecc9fdf\n" }, { "commit": "6c169f50f2dbde04d7f5c8a2a55e49666f41285e", "tree": "3bd3a56bdef6eba452271e999ea53fff8241fb8c", "parents": [ "1b8beec1ccebbdf8c0ec1a592e88339e2e54fc28", "8440f04eddb4d1573649e3291213d730cdf75a70" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 23:54:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 23:54:55 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 577a2de0a1 -s ours am: 8440f04edd -s ours\n\nam skip reason: Merged-In If7cd3bedb522377b908cbc23a406f66afc3a33be with SHA-1 6d9bc33d44 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/25093141\n\nChange-Id: I42299060ed95e32da94a0336298a51b77d7012f0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8440f04eddb4d1573649e3291213d730cdf75a70", "tree": "1c6d62a45b285251cbc13e734454a4d4b6edc179", "parents": [ "ab45ba088d33b5a81b0072a8384de6e30744de3e", "577a2de0a1d490d34172d9c91314efc757223c83" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 18:48:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:48:09 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 577a2de0a1 -s ours\n\nam skip reason: Merged-In If7cd3bedb522377b908cbc23a406f66afc3a33be with SHA-1 6d9bc33d44 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/25093141\n\nChange-Id: Idaf36b308bff040739b620aa08fd1122eb6e998d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "577a2de0a1d490d34172d9c91314efc757223c83", "tree": "1c6d62a45b285251cbc13e734454a4d4b6edc179", "parents": [ "190d9be9c6db437c726700f2815aa90dffb495da", "6d9bc33d4444fdc4c6d35453f3aeabad3fc5947e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:07:51 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:07:51 2023 -0700" }, "message": "Merge 10952656\n\nMerged-In: If7cd3bedb522377b908cbc23a406f66afc3a33be\nChange-Id: I089bb3e8d298939be40519551f224a88ab2ac356\n" }, { "commit": "1b8beec1ccebbdf8c0ec1a592e88339e2e54fc28", "tree": "3bd3a56bdef6eba452271e999ea53fff8241fb8c", "parents": [ "dda22ca2167f2bc589f4b76a599675047fdeb8d8", "ab45ba088d33b5a81b0072a8384de6e30744de3e" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 16 20:57:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 20:57:56 2023 +0000" }, "message": "[automerger skipped] Merge \"sunfish: Replace NFC app with NFC apex\" into main am: a3c8cd657e am: 190d9be9c6 am: b73fc3360d am: be9f4c4dfd am: ab45ba088d -s ours\n\nam skip reason: Merged-In I58db10daa2e9e21b3aba5dac484dfbc4a77fb1aa with SHA-1 dda22ca216 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2779847\n\nChange-Id: I2379a26020138785d2aeab902afe64c0617bae31\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ab45ba088d33b5a81b0072a8384de6e30744de3e", "tree": "1c6d62a45b285251cbc13e734454a4d4b6edc179", "parents": [ "6d9bc33d4444fdc4c6d35453f3aeabad3fc5947e", "be9f4c4dfd1fec446db157d17ef0a73d8d074d26" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 16 20:49:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 20:49:15 2023 +0000" }, "message": "Merge \"sunfish: Replace NFC app with NFC apex\" into main am: a3c8cd657e am: 190d9be9c6 am: b73fc3360d am: be9f4c4dfd\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2779847\n\nChange-Id: I49c2435679ee798db88a95b90c067a54d95a98a0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "be9f4c4dfd1fec446db157d17ef0a73d8d074d26", "tree": "1d07a1c1e90001e2630e423691859be618426d12", "parents": [ "680b09200aac9f2abe5acecae6f0aff0e467cd66", "b73fc3360d4f5e450a0de50d1f0023fe855f8389" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 16 20:13:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 20:13:12 2023 +0000" }, "message": "Merge \"sunfish: Replace NFC app with NFC apex\" into main am: a3c8cd657e am: 190d9be9c6 am: b73fc3360d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2779847\n\nChange-Id: Idb6346ab06599488fabeb9f5157527f527edd661\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b73fc3360d4f5e450a0de50d1f0023fe855f8389", "tree": "1d07a1c1e90001e2630e423691859be618426d12", "parents": [ "e31dd9078958ef6c9869d1fac689a981076ab614", "190d9be9c6db437c726700f2815aa90dffb495da" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 16 19:38:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 19:38:22 2023 +0000" }, "message": "Merge \"sunfish: Replace NFC app with NFC apex\" into main am: a3c8cd657e am: 190d9be9c6\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2779847\n\nChange-Id: Ica6146ecfa8b134e59cbecf48c56c7843d42d1d1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "190d9be9c6db437c726700f2815aa90dffb495da", "tree": "888b91fa7c41a7720b6052547e07af98572ba0f4", "parents": [ "c3253aad84bb1b93c156bf5f293e5d9fff9f0429", "a3c8cd657e13050d671f1b218b59087cac865b9a" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 16 19:15:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 19:15:59 2023 +0000" }, "message": "Merge \"sunfish: Replace NFC app with NFC apex\" into main am: a3c8cd657e\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2779847\n\nChange-Id: I1a29b17ca66382456b57dba23939bc287e095a0e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a3c8cd657e13050d671f1b218b59087cac865b9a", "tree": "888b91fa7c41a7720b6052547e07af98572ba0f4", "parents": [ "5a686a32b058beadecb6dce40de0094dcdc6506a", "38e23add89210815483696b60049b7d61b3cc8e9" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 16 18:31:02 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 16 18:31:02 2023 +0000" }, "message": "Merge \"sunfish: Replace NFC app with NFC apex\" into main" }, { "commit": "38e23add89210815483696b60049b7d61b3cc8e9", "tree": "403bc6e8cf87eaba707d2c7aeeaff1364ebbed7c", "parents": [ "419fec4120c78ad4258df01664e54d900904f31a" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 09 12:47:16 2023 -0700" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Oct 13 18:04:26 2023 +0000" }, "message": "sunfish: Replace NFC app with NFC apex\n\nBug: 303286040\nTest: Compiles\nMerged-In: I58db10daa2e9e21b3aba5dac484dfbc4a77fb1aa\nChange-Id: I58db10daa2e9e21b3aba5dac484dfbc4a77fb1aa\n" }, { "commit": "dda22ca2167f2bc589f4b76a599675047fdeb8d8", "tree": "3bd3a56bdef6eba452271e999ea53fff8241fb8c", "parents": [ "4e4ff871ce55712b0d9d4e7227c797e59ce5315b" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Mon Oct 09 19:57:02 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Oct 09 19:57:02 2023 +0000" }, "message": "sunfish: Replace NFC app with NFC apex\n\nBug: 303286040\nTest: Compiles\n(cherry picked from https://android-review.googlesource.com/q/commit:afbdc87ddb40f7e0c997ff14d0c7acf06d536e44)\nMerged-In: I58db10daa2e9e21b3aba5dac484dfbc4a77fb1aa\nChange-Id: I58db10daa2e9e21b3aba5dac484dfbc4a77fb1aa\n" }, { "commit": "4e4ff871ce55712b0d9d4e7227c797e59ce5315b", "tree": "42920af766c1c56a0b015d2915e6b58426ac6d90", "parents": [ "4439c9caaf2c584dbeee7f05b51c0b2cf6e305a7", "6d9bc33d4444fdc4c6d35453f3aeabad3fc5947e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:19:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:19:58 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 5a686a32b0 -s ours am: c3253aad84 -s ours am: e31dd90789 -s ours am: 680b09200a -s ours am: 6d9bc33d44 -s ours\n\nam skip reason: Merged-In I0528c819ce022a9a187f361d744f65d0335ca647 with SHA-1 21fcb611e6 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/sunfish/+/2774977\n\nChange-Id: Ic782d2e327b067120099860ecae46bef27bd6388\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "6d9bc33d4444fdc4c6d35453f3aeabad3fc5947e" }