Bill Yi
fa35c27784
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0052d1a761 -s ours am: c0dd9bcc28 -s ours am: 088677a1ae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18508312
Change-Id: I961765f73575c14fe9c4753e1215fd304e5bdfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:02:44 +00:00
TreeHugger Robot
08354255ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5f64bb837d -s ours am: 2599fc613e -s ours am: 7ad3c861da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I70516777249e188b96d7e2be61aad208a92c3986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:02:06 +00:00
Bill Yi
042481e6ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 249c65196a -s ours am: 08575d6265 -s ours am: 76bdfa0916 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I3b6a3bffbef764c6857c821dbf280abc3f2f95b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:01:55 +00:00
Bill Yi
088677a1ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0052d1a761 -s ours am: c0dd9bcc28 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18508312
Change-Id: Ia88a0ebe7d931e3d858659d93b2426826fc977f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:44:29 +00:00
TreeHugger Robot
7ad3c861da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5f64bb837d -s ours am: 2599fc613e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I3c3c11254cf6ad0e4adbd9b97c2216bda2787186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:42:36 +00:00
Bill Yi
76bdfa0916
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 249c65196a -s ours am: 08575d6265 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: Icc64bf9f3114e2910512114d19957e2a5daeb033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:42:18 +00:00
TreeHugger Robot
bd2462172e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5f64bb837d -s ours am: 2599fc613e -s ours am: 7f92353091 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: Ib945b985f4cf51b17213c7e41bbdd35ac525e85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:37:20 +00:00
Bill Yi
b03e51e2a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 249c65196a -s ours am: 08575d6265 -s ours am: 7e6d8b5e10 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I385733ad1e7aa33ebbc843e8c8af75fd142a013d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:37:09 +00:00
Automerger Merge Worker
b6b448a987
Merge changes from topic "am-7be37ea9f2fe450e92024c007baaf9d4" into tm-d1-dev-plus-aosp
...
* changes:
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3d3 am: 1d27579684
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f am: 1d83999ad0
2022-05-23 19:36:00 +00:00
Vadim Caen
cbb5405f64
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3d3 am: 1d27579684
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I67b6a6197a2763e55c55e9645e9890501e31002a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:35:51 +00:00
Vadim Caen
26695c9ef2
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3d3 am: d667d306d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I9a8b83c3530b9cc315bdec1b7fec5e20515f2fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:35:46 +00:00
Vadim Caen
fa5b989e88
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f am: 1d83999ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I38a2f055bd3a929a48dd34b251e8ba40aa38f406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:35:36 +00:00
Vadim Caen
215a8bd8ea
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f am: e8e4c63aed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I0d653e26200f0a6aafa0eb5959517cd45a55e60d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:35:33 +00:00
Miranda Kephart
204470a3c1
Merge "Add logs for clipboard and screenshots" into tm-dev am: 53af3ea395 am: 67881dbb9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18511278
Change-Id: Ia499e463dab22110f5b3e27f706c58425d1d9b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:34:34 +00:00
Automerger Merge Worker
cb8746605d
Merge changes from topic "am-5ab8b98d744945ad9ca21a34f2809719" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e3aa92a5c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6589d83461 -s ours
2022-05-23 19:33:37 +00:00
Miranda Kephart
e52e3b6b5e
Merge "Add logs for clipboard and screenshots" into tm-dev am: 53af3ea395 am: 66a06af834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18511278
Change-Id: Iae0139353eb49c3c24f67aacc6b9394a7dbd5861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:06 +00:00
Bill Yi
c0dd9bcc28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0052d1a761 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18508312
Change-Id: Iab72c26decfad62081ce01db69a78f48ef55d1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:50 +00:00
TreeHugger Robot
429cc122e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e3aa92a5c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18517099
Change-Id: Ib1bc5581a2bcb064c8d884f99b7fb44a7f5bb4c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:49 +00:00
TreeHugger Robot
7f92353091
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5f64bb837d -s ours am: 2599fc613e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I68575d8ba76f886d17b4b9ccceaccb09bc0eee7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:43 +00:00
Bill Yi
91c14c9aa5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6589d83461 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18517099
Change-Id: I10db4d0e17d44da32528b805e9f12e10cf08a459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:33 +00:00
Bill Yi
7e6d8b5e10
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 249c65196a -s ours am: 08575d6265 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: Iffe2b1ab0819ba6d1ace853621d73bc6651e2e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:31 +00:00
Vadim Caen
1d27579684
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I9854f207cd81785a572f1e967244b876acb1f226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:03 +00:00
Vadim Caen
1d83999ad0
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I150be6a4fae771ffe6e841806772aa2218ae871b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:00 +00:00
Vadim Caen
d667d306d7
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: Iaa57b462853e8b200aa0d33df35bf9558c7ec719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:23 +00:00
TreeHugger Robot
2599fc613e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5f64bb837d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I70df1500a79d2070e9165b0a3f09d42e7f840b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:21 +00:00
Vadim Caen
e8e4c63aed
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: Ibf27183e26a5a8dca9f2856de7e84016ee6e0b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:18 +00:00
Bill Yi
08575d6265
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 249c65196a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513129
Change-Id: I4bfaeaa7d5459a5a469fb9a3f874229868155b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:00 +00:00
Vadim Caen
451dc8a3d3
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev
2022-05-23 19:05:48 +00:00
Miranda Kephart
67881dbb9a
Merge "Add logs for clipboard and screenshots" into tm-dev am: 53af3ea395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18511278
Change-Id: I4440b9d98fb50a61481d6f1ca9f6d6b856b822b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:54:22 +00:00
Miranda Kephart
66a06af834
Merge "Add logs for clipboard and screenshots" into tm-dev am: 53af3ea395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18511278
Change-Id: I35db6105ba334132b3008d303e171ea2b14dd27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:52:22 +00:00
TreeHugger Robot
8e3aa92a5c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:29 +00:00
Shashwat Razdan
848f9a3ba4
Merge "Unlink to death before removing the callback wrapper in SmartspaceService/AppPredictionServic3e" into tm-dev am: 1ec2fe2e7d am: 6630d4160c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475472
Change-Id: I3ebc95a4ce1188a7c273c1032963aff743e61f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:44:08 +00:00
TreeHugger Robot
5f64bb837d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-23 18:40:50 +00:00
Miranda Kephart
53af3ea395
Merge "Add logs for clipboard and screenshots" into tm-dev
2022-05-23 18:32:12 +00:00
Shashwat Razdan
92cac63acb
Merge "Unlink to death before removing the callback wrapper in SmartspaceService/AppPredictionServic3e" into tm-dev am: 1ec2fe2e7d am: 187a2c4153
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475472
Change-Id: Idb478cd0a58823064dc473c7bd6e40a0be5b617e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:18:16 +00:00
Shashwat Razdan
187a2c4153
Merge "Unlink to death before removing the callback wrapper in SmartspaceService/AppPredictionServic3e" into tm-dev am: 1ec2fe2e7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475472
Change-Id: Ie12d850e7522fa2e170c29c5b2a8c943541f3d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:18:02 +00:00
Bill Lin
f0e7087cc6
Merge "Instrument CUJ_BIOMETRIC_PROMPT with InteractionJankMonitor" into tm-d1-dev am: 9ecbf3139d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482949
Change-Id: I38164b8c8da60ad6186da0c70e80e42b82e706da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:18:01 +00:00
Shashwat Razdan
6630d4160c
Merge "Unlink to death before removing the callback wrapper in SmartspaceService/AppPredictionServic3e" into tm-dev am: 1ec2fe2e7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475472
Change-Id: I89a69292956df070dadb4e3fa83464ff41436a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 18:16:41 +00:00
Bill Lin
9ecbf3139d
Merge "Instrument CUJ_BIOMETRIC_PROMPT with InteractionJankMonitor" into tm-d1-dev
2022-05-23 17:58:57 +00:00
Shashwat Razdan
1ec2fe2e7d
Merge "Unlink to death before removing the callback wrapper in SmartspaceService/AppPredictionServic3e" into tm-dev
2022-05-23 17:56:46 +00:00
TreeHugger Robot
ebb1798502
[automerger skipped] Merge "MediaCodec: don't cache buffers until requested" into tm-dev am: d7d0d4b1ab am: 3d70ebf141 -s ours
...
am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 d59a075f79 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501488
Change-Id: I00df38b33e07cb74a73fd6bf4bc74f76c731fab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:51:55 +00:00
James O'Leary
082277f331
Merge "Media output selector chip color updated per designers" into tm-dev am: 058f1d9eb1 am: bcc8cc7501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164073
Change-Id: I5bc9ed85788d5c78030b8f46d34140135d456e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:51:10 +00:00
TreeHugger Robot
a70939a932
[automerger skipped] Merge "MediaCodec: don't cache buffers until requested" into tm-dev am: d7d0d4b1ab -s ours am: d736f50d09 -s ours
...
am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 07358dfea5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501488
Change-Id: Iebb8c094f17c62c50fdedcf3a4a504cf2b41a1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:42:21 +00:00
Wonsik Kim
11a23a98b7
[automerger skipped] MediaCodec: don't cache buffers until requested am: d59a075f79 -s ours am: a1f88c3b05 -s ours
...
am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 07358dfea5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501488
Change-Id: I3fe909efe3011e3e0f5e3c0e6a566b02ce61c40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:42:13 +00:00
James O'Leary
4cff24f212
Merge "Media output selector chip color updated per designers" into tm-dev am: 058f1d9eb1 am: 63e6269c82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164073
Change-Id: Ief0abc165c5b2202dbd5d08034163cf1a42cd71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:42:00 +00:00
TreeHugger Robot
3d70ebf141
Merge "MediaCodec: don't cache buffers until requested" into tm-dev am: d7d0d4b1ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501488
Change-Id: Icb93d5a43e41482f4ad48e927941c848b0b174e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:26:09 +00:00
James O'Leary
bcc8cc7501
Merge "Media output selector chip color updated per designers" into tm-dev am: 058f1d9eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164073
Change-Id: If11c8753f969ac5c40f157058911f7318b9af187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:25:21 +00:00
TreeHugger Robot
d736f50d09
[automerger skipped] Merge "MediaCodec: don't cache buffers until requested" into tm-dev am: d7d0d4b1ab -s ours
...
am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 07358dfea5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501488
Change-Id: I2e93926b6c27fc2c1162f680ea1691afda30358f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:24:50 +00:00
Wonsik Kim
a1f88c3b05
[automerger skipped] MediaCodec: don't cache buffers until requested am: d59a075f79 -s ours
...
am skip reason: Merged-In I4caca59d6854416cedb6758fe66aefaacb69beb7 with SHA-1 07358dfea5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501488
Change-Id: I08aff0e101afe6c4103212fd5cfc5c3afc24928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:24:36 +00:00
James O'Leary
63e6269c82
Merge "Media output selector chip color updated per designers" into tm-dev am: 058f1d9eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164073
Change-Id: I5282a84c3fc1c4a2d5a263ca5c402563801e13e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:23:46 +00:00