Commits · 8e3b54f855d1be0ad1c96a7c14db15480e3cd5fb · Dhina17 / platform_frameworks_base

Sep 29, 2023

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to... · 8e3b54f8

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours am: 2058e088 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188



Change-Id: I353c13d65face71cad9d21d3c4e89bc87c04e2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8e3b54f8

[automerger skipped] Revert "Revert "Updated AnimatedContentScope to... · f8374721

Anvesh Renikindi authored 1 year ago

[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c3337 -s ours am: c607a8d9 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188



Change-Id: If886be90908cf8f90ac6ae45df066e18a84e0e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f8374721

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost"""... · 8b2d61eb

Anvesh Renikindi authored 1 year ago

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215



Change-Id: I680501cc3ac6d04e6cef409d29e24a7287f5f298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8b2d61eb

[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am:... · 3eb66b1a

Anvesh Renikindi authored 1 year ago

[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527 -s ours am: 0b9294f5 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215



Change-Id: Iddf1ebe60ac6f062731c01c0006c031b46fc74d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3eb66b1a

Merge "Move page count to rememberPagerState" into aosp-main-future am: am: · 7317c15e

Anvesh Renikindi authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151

Change-Id: Ic9a780ce121873cbef41b7f371c5b08d115fedff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7317c15e

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to... · 2058e088

Anvesh Renikindi authored 1 year ago

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188



Change-Id: I9fc86b0c7010f54ee51a98aa17bccf55027e7812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2058e088

[automerger skipped] Revert "Revert "Updated AnimatedContentScope to... · c607a8d9

Anvesh Renikindi authored 1 year ago

[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c3337 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188



Change-Id: I14bff46034aa0d5d1fda4763b445d2fb55bad83c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c607a8d9

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost"""... · 876446b1

Anvesh Renikindi authored 1 year ago

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215



Change-Id: Id501e359f05cc551669b8ba816467eef622b07d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

876446b1

[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: -s ours · 0b9294f5

Anvesh Renikindi authored 1 year ago

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215

Change-Id: Ie63e3119194b0b772fbb2e72ed217a4bd89f0d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0b9294f5

Merge "Move page count to rememberPagerState" into aosp-main-future am: · f3decd99

Anvesh Renikindi authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151

Change-Id: I1c81b0b23a7ccf64031bc77e475acb50cd81ce53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f3decd99

Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future · 54cf6ff5
Anvesh Renikindi authored 1 year ago

54cf6ff5
Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future · cfcad9c2
Anvesh Renikindi authored 1 year ago

cfcad9c2
Merge "Move page count to rememberPagerState" into aosp-main-future · e8a2bcbd
Anvesh Renikindi authored 1 year ago

e8a2bcbd

Merge "Added new framework-pdf jar inside MediaProvider module" into main am:... · 08ae7288

Mark White authored 1 year ago

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091 am: ea26d808

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388

Change-Id: I7f4d72d4a44aff9911a7486364d8e48f330ae6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

08ae7288

Merge "Added new framework-pdf jar inside MediaProvider module" into main am:... · ea26d808

Mark White authored 1 year ago

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388

Change-Id: Ie19ac593c83393b7938f2f533f703e15b89ec6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ea26d808

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: · f9641091

Mark White authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388

Change-Id: I6d833e61f568ecf73119c6ac5cd5f6d4790ea50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f9641091

Merge "Added new framework-pdf jar inside MediaProvider module" into main · e6c4de26
Mark White authored 1 year ago

e6c4de26

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am:... · d0b7962c

Xin Li authored 1 year ago

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af043 -s ours am: 81dd77b9 -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326



Change-Id: I228c1d2bb13502c8248b3775f502c28943f79487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d0b7962c

[automerger skipped] Merge UP1A.231005.007 am: -s ours am: -s ours · 927b4b9b

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326

Change-Id: I25d07696ec0266b6e4db36b36b92770de79061e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

927b4b9b

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: -s ours · 81dd77b9

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326

Change-Id: Ie76038a96321a0b0ca12a04c8c4d56dac1bf27b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

81dd77b9

[automerger skipped] Merge UP1A.231005.007 am: -s ours · ac281ffd

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326

Change-Id: Ifbdc306016c1a7e094ad9eac46c720f2acd708c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ac281ffd

Merge "Merge UP1A.231005.007" into aosp-main-future · ee8af043
Xin Li authored 1 year ago

ee8af043

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 49e063af

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: 0542b70d -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I95a9e322b763c016d563b28e0ac47359d90a92c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

49e063af

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 9e96ae63

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 6dfd94a1 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I7dbdbbe9b0ebe824b1cf780a43565b60ab220759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9e96ae63

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · cf11a619

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I77c00b27c7f9f5cc492905d3b708d36e9217f4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cf11a619

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 85a23a76

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ib541ddf5bf4e0e8aadde37b63ffc86e41aec0e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

85a23a76

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · ae621908

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I1b300bc975178df62bdb1d747bd37d08ffd7cfbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ae621908

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 4d8bb9af

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I5092d539b092d113487d2738d68c80068f04a4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4d8bb9af

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 0542b70d

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ie1031a2bd96b85fa44b23a2dc46363e9dd59c3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0542b70d

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 6dfd94a1

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Iabc5c6d15f7e1b25e60c4f0d416d032668921226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6dfd94a1

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 4420eab7

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I32ad328e67c46d9605e191675ca479f8ebb99271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4420eab7

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · d06e0acf

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ia869037c96a72937200e207907a072ada596c35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d06e0acf

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 8b6c78c7

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I8c9b34afafb28597afd38c887e965d395035c134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8b6c78c7

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · b4c64978

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Id08ae2f3f841511af4960004bb3aacf5ceffc824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b4c64978

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · a2afc42c

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ic5d881ca4e0c68edc53fcec53ab327ae45ff01b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a2afc42c

Sep 28, 2023

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 6b74b34a

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I014bdcff1d3dd3902c4155ce26b575a70846bcba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6b74b34a

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 39abde02

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ic6933da88e36b463ac5c71f5297f8eb824f891c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

39abde02

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 79be2c99

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I5a59e5f4bc95ecb45dbe11f0ebabdefda32f755a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

79be2c99

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 285b8a1b

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ie675bd43fc1c7022faa64fa0d66587e279ec0960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

285b8a1b

Merge "Make bootclasspath srcjar available to make" into main am: ... · 2efdf170

Anton Hansson authored 1 year ago

Merge "Make bootclasspath srcjar available to make" into main am: 53565bfd am: 5fc30c4d am: 6be73d41

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760386

Change-Id: I748532cf29790921b0f68e831c0f3a08c172cd8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2efdf170