Commit Graph

780522 Commits

Author SHA1 Message Date
Lee Shombert
0358012a6e Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab75e am: 50ee494d30 am: c8d7b7c691
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717283

Change-Id: I98f8bb60ba63510fa4fe71402542badc5c5cea8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:43:05 +00:00
Josh Tsuji
87a3ef0010 Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f976e am: c8f8b28ba7 am: 452259b937
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713339

Change-Id: If43599b854ef155baba922fe048002d1970b1796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:42:31 +00:00
Lee Shombert
c8d7b7c691 Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab75e am: 50ee494d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717283

Change-Id: I6b68521b6692ff796e47f3cd2a394307a113ef1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:17:48 +00:00
Josh Tsuji
452259b937 Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f976e am: c8f8b28ba7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713339

Change-Id: Icf0906af4b84966ed03c60c2b051b350436d5f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:17:28 +00:00
Jing Ji
44b6cb625f Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd am: 33ef13be79 am: 36779d370c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I78d6a21259daee30a610728be1ab999e89f8666e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:53:38 +00:00
Lee Shombert
50ee494d30 Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab75e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717283

Change-Id: I41e4d72763ea5c7f50eeb6ea190b590a2c2c9c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:53:09 +00:00
Chavi Weingarten
d114dc4ac4 Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912 am: 66df543e79 am: 2fc1ebac8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: Id9171436fea36017dbf6517a438e194cd640296c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:52:54 +00:00
Josh Tsuji
c8f8b28ba7 Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f976e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713339

Change-Id: I9193221f70a9c33221e95148fff4ad3c6befbe35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:52:52 +00:00
Jing Ji
a192e93c59 Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd am: 4fe78f6476 am: 919087710b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I0cc5c63e8a355991daacdb1bd3ea44ad04586446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:52:08 +00:00
Chavi Weingarten
8745cfb6a3 Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912 am: 8ebe22e33b am: b4524eb76d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: I2994427fd273e2638832a739d7f03c03127f9aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:51:49 +00:00
Automerger Merge Worker
1e14faa535 Merge "[automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 0dc4f04fc5 -s ours" into tm-d1-dev-plus-aosp am: 2ef32f4e7f -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 e86cdf4ba1 is already in history

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

Change-Id: I16b8b4c65677f8d5809566e9484c069cc1ab6b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:51:04 +00:00
Presubmit Automerger Backend
ef8539dfd1 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 0dc4f04fc5 -s ours am: 83b3326049 -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: I190c41d9c9ec3cdc29eaa4464c34acf2dce647d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:51:01 +00:00
Presubmit Automerger Backend
672df585d4 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 1710e1734c -s ours am: 2bd5f5a603 -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: I485c2658f773088cbe11fd682370110ad0037ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:48:53 +00:00
Vinit Nayak
21dceecca3 Merge "Rename split classes/variables for consistency" into tm-qpr-dev am: 422f1d8b4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18639323

Change-Id: Iee38a4149b6a0dadd68fc64d982cbf89577a043a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:42:29 +00:00
Jing Ji
7dda99bc05 Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd am: 4fe78f6476 am: 2456f4957d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I76d54fd8316f8198095d6d87b447c6b5b9f52165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:41:57 +00:00
Chavi Weingarten
e76bea9809 Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912 am: 8ebe22e33b am: 78b2a87d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: I73f58e8896cc89ef38dec94c5b4cc098c3249e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:41:15 +00:00
Presubmit Automerger Backend
50e02d08a0 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 1710e1734c -s ours am: 09816e7cd3 -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: Ic893a7c6ef9ca4b2727cd4e09a9d072184dc0ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:40:05 +00:00
Vinit Nayak
422f1d8b4e Merge "Rename split classes/variables for consistency" into tm-qpr-dev 2022-06-07 22:36:47 +00:00
Lee Shombert
8dc0bab75e Merge "Avoid ANRs in dumpCacheInfo" into tm-dev 2022-06-07 22:13:06 +00:00
Josh Tsuji
13e74f976e Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev 2022-06-07 22:06:25 +00:00
Jing Ji
36779d370c Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd am: 33ef13be79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I45990c96037d90616d00c2007beb4219201d9ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:59:35 +00:00
Chavi Weingarten
2fc1ebac8e Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912 am: 66df543e79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: I47085cb6ecc2925ed703ee4000164ee97c26014d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:58:44 +00:00
Jing Ji
2456f4957d Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd am: 4fe78f6476
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I5d411e13b722989aac4c93e9cbf6aaab7cda1585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:58:43 +00:00
Chavi Weingarten
78b2a87d6b Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912 am: 8ebe22e33b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: I6cd47246a4046e634e1a5189cf15beab41c17a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:58:22 +00:00
Jing Ji
919087710b Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd am: 4fe78f6476
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I3b9e0f7cbbde50ad200986d71a02e612c9bdd8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:58:14 +00:00
Chavi Weingarten
b4524eb76d Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912 am: 8ebe22e33b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: I812f618f813dca1760d3c50a415e6acc0b327178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:57:51 +00:00
Automerger Merge Worker
2ef32f4e7f Merge "[automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 0dc4f04fc5 -s ours" into tm-d1-dev-plus-aosp 2022-06-07 21:57:22 +00:00
Presubmit Automerger Backend
09816e7cd3 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 1710e1734c -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: Iaa7051836c33e4e26f3b508532c6142059898bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:57:09 +00:00
Presubmit Automerger Backend
83b3326049 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 0dc4f04fc5 -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: Ic0ddcee025ab4c1d74aa7f96dec6ce9b0689021f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:57:07 +00:00
Presubmit Automerger Backend
2bd5f5a603 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours am: 1710e1734c -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: I4652d95f474ea6f3c5aa9c422fe8b4484599dac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:57:04 +00:00
Jing Ji
4fe78f6476 Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: Ie22cbaf2289d9910d4488bc89958d3bd84d171dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:38:39 +00:00
Chavi Weingarten
8ebe22e33b Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: Ie6df36eacfe7de48bb2038c9889b9ef419981cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:37:51 +00:00
Presubmit Automerger Backend
1710e1734c [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: I2addf22e827bdc24487064b96e1aafba3bc95bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:37:24 +00:00
Jing Ji
33ef13be79 Merge "Add field to note if a process has a foreground service" into tm-dev am: b6c06687dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764698

Change-Id: I427f955b0bcddcc515e56edd523178aeec4b9f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:36:57 +00:00
Chavi Weingarten
66df543e79 Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f7912
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775294

Change-Id: I8acd61169bd7ed14551f402580aae3ca24766393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:36:18 +00:00
Presubmit Automerger Backend
0dc4f04fc5 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours am: 8332f011ae -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: I5dadb8a44f53f1767b1e6d9737f88d63cac2d6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:35:50 +00:00
Jing Ji
b6c06687dd Merge "Add field to note if a process has a foreground service" into tm-dev 2022-06-07 21:30:18 +00:00
Chavi Weingarten
72a26f7912 Merge "Report sync complete when VRI won't draw" into tm-dev 2022-06-07 21:14:42 +00:00
Presubmit Automerger Backend
8332f011ae [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours am: 33be467251 -s ours
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: If577520ad40e2db9d6d7bb93d94ed6ea7704eee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:13:20 +00:00
Steven Terrell
729916bc53 Merge changes from topic "stop-leaked-animators" into tm-dev am: a4ac1574bd am: d34d8c796f am: 01b9b68d75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18602917

Change-Id: I0e8d1f049400ecca1bc53dd133cc363372e23a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:55:46 +00:00
Chet Haase
97c6ab0823 [automerger skipped] Disable debug logging in AnimationHandler am: 506ca2410e am: 04bf9fa795 am: 41c2c59f59 -s ours
am skip reason: Merged-In Ie14cf3c0bacb50dd1e7422dc378d5195e4d9bec5 with SHA-1 506ca2410e is already in history

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

Change-Id: Ic4e8cce2eaf836bf269af538be233962da5ec418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:55:35 +00:00
Chet Haase
185472328b [automerger skipped] Allow system to disable behavior of pausing animators for bg apps am: 161732cf18 am: 339361ad29 am: 5e5539db78 -s ours
am skip reason: Merged-In Idf4957e3968253228096671fde89f820311883e3 with SHA-1 161732cf18 is already in history

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

Change-Id: I3ef011577d1e85084ca0e2f5b0c81da1d6e3a0e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:55:16 +00:00
Chet Haase
5709ca0d5e [automerger skipped] Pause animators when app is not visible am: b99cc5b4c8 am: f2e66fa4ed am: bc0921f2d8 -s ours
am skip reason: Merged-In I8b9f841cc80babb972244c724968a5c085a06b69 with SHA-1 b99cc5b4c8 is already in history

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

Change-Id: I6d95e4b86719aefee99c7337beea6f5d2adf082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:55:07 +00:00
Steven Terrell
4f0fcf32af Merge changes from topic "stop-leaked-animators" into tm-dev am: a4ac1574bd am: c0198118a0 am: 50df26a0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18602917

Change-Id: I242643acc7fc3586c1751faa2491930aa2a33679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:54:21 +00:00
Chet Haase
16ff0ad26e [automerger skipped] Disable debug logging in AnimationHandler am: 506ca2410e am: 345c85f4da am: 48eec076fc -s ours
am skip reason: Merged-In Ie14cf3c0bacb50dd1e7422dc378d5195e4d9bec5 with SHA-1 506ca2410e is already in history

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

Change-Id: I36abd76543690fc6d2c688588df8b234082709f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:54:18 +00:00
Chet Haase
85e4a1ec40 [automerger skipped] Allow system to disable behavior of pausing animators for bg apps am: 161732cf18 am: b67d9848d2 am: 73b3421e1d -s ours
am skip reason: Merged-In Idf4957e3968253228096671fde89f820311883e3 with SHA-1 161732cf18 is already in history

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

Change-Id: I95dd596a012292ccc589e356b72e5a9e9ad39326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:54:01 +00:00
Chet Haase
6d5a1bf974 [automerger skipped] Pause animators when app is not visible am: b99cc5b4c8 am: 4551f51dcd am: 02b4c75ea9 -s ours
am skip reason: Merged-In I8b9f841cc80babb972244c724968a5c085a06b69 with SHA-1 b99cc5b4c8 is already in history

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

Change-Id: I77fcc1436f64a92383d68c79dd3d3355c3089145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:53:49 +00:00
Automerger Merge Worker
eea488c1b6 Merge "Merge "Merge "Update Vibrant Neutral palette from 8 chroma to 10" into tm-dev am: bb4868d65d am: 8163ee6fdc" into tm-d1-dev-plus-aosp am: 4400723ccc" into tm-qpr-dev-plus-aosp 2022-06-07 20:53:10 +00:00
Automerger Merge Worker
a7e28f8ad7 Merge "Merge "Update Vibrant Neutral palette from 8 chroma to 10" into tm-dev am: bb4868d65d am: 8163ee6fdc" into tm-d1-dev-plus-aosp am: 4400723ccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18742668

Change-Id: I7d8716afdd47f987cb0f7aa7d57be4a136a2828a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:52:44 +00:00
Steven Terrell
7afcc42860 Merge changes from topic "stop-leaked-animators" into tm-dev am: a4ac1574bd am: d34d8c796f am: c56fad3edd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18602917

Change-Id: Ia0daa985ab6161431b8a76788030e1a18a8e3b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 20:52:28 +00:00