Commit Graph

835585 Commits

Author SHA1 Message Date
Derek Jedral
aad5b3000d Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev am: a20c6a4cf8 am: d6eff4971c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970372

Change-Id: Ibeab0482cd1d918bdcab8dfa9755bcbc0e99243e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:25:28 +00:00
TreeHugger Robot
51aec7f558 Merge changes I0e3aadba,I037a2b2f into tm-qpr-dev am: c5637910b8 am: 4b71722f70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19557873

Change-Id: Ibcb67396b16702afc6d04904afbabf9b03a18a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:24:08 +00:00
Automerger Merge Worker
ba5fd0cfb6 Merge changes from topic "am-cabd4650c28c44639baf0539bd42a1b6" into tm-qpr-dev-plus-aosp am: d00ed5594c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994818

Change-Id: I99081cb6186499161f0ecb768025c2d7229c9239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:22:39 +00:00
Bill Yi
c1dc7a9984 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f94886869e -s ours am: 6c066d6534 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a62fee30d36108b3e4f5a761b5bdcf21febef40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:22:03 +00:00
Anton Hansson
603d9aa01b Merge "Run additional compat checks for checkapi" am: 6196e669fb am: 335f3fc4d6 am: 151ac18420 am: ac18d1ab5f am: 153037dbfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2223378

Change-Id: Icb3148b6558528403cf55a976e879e19fd0b86b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:14:33 +00:00
Chiachang Wang
e8ffd621e8 Merge "Remove the restricted user enforcement in getAppExclusionList" am: 11cf828984 am: 5cbf834eef am: 344d20a308 am: cf161fecc6 am: 859eb1eafa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220584

Change-Id: I33952165e6fea312f6ba65b0e151aee482d09c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:13:13 +00:00
Mythri Alle
cfcf961122 Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca37 am: a1b0512a78 am: 59afb30fdb am: e14b396e68 am: f973b28aa0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217921

Change-Id: I179d74253c1c49b522ae3a9db2f6e45677397687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:11:21 +00:00
TreeHugger Robot
99a482c857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34e4bc07e7 -s ours am: d5596609d9 -s ours am: d4635b31a9 -s ours am: f87b038afc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23b85c317ceead35477f4b6b10e28c6b3ce1c112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:07:01 +00:00
Bill Yi
f83c710b23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2348782a2 -s ours am: da465afb51 -s ours am: f0c1b1f5fd -s ours am: c91656243f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad9e2591bc4c0d7805f806ce276c33f21a3e3082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:06:15 +00:00
TreeHugger Robot
a645dc77e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 075f9ceed2 -s ours am: 67e152dc3a -s ours am: 4611240975 -s ours am: 1db0d4675c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77002c86f7475bbd77d627d3039d04f698cfceb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:05:57 +00:00
Bill Yi
44bcd43337 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3429b29ce3 -s ours am: 490995a6cf -s ours am: 075585f872 -s ours am: 78b5ea6951 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f87dbbddea972c886e01cab6b139ba24f204252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:05:37 +00:00
TreeHugger Robot
77aceba122 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55280a3b18 -s ours am: 65232daea8 -s ours am: 422b3c53bc -s ours am: 5e8c21f5c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I865abb5a68e515cf764e84c53cb10e8553d1d02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:05:00 +00:00
Bill Yi
baed5a04cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3da8cb0bd -s ours am: 3117257972 -s ours am: 752c2ba73b -s ours am: 4e4a2c7c31 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28b5c255d603551c3e7668ae8a67d6eeff5fc735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:04:17 +00:00
TreeHugger Robot
ee3cec2874 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e495ec6635 -s ours am: 558d2840d0 -s ours am: fda1597b1d -s ours am: df57356ad6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb2ad0006964d1ee960bb105efd72b7f44d2afcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:04:00 +00:00
Bill Yi
fb2eca0885 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a0d129a4e -s ours am: e958bd45b6 -s ours am: 43b1c25e78 -s ours am: 0ce49d95a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34849441757826e61dcfea7c55e775e0405a9cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:03:39 +00:00
TreeHugger Robot
00085887f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 9b4cb6ab33 -s ours am: c924f96241 -s ours am: bb83b15f36 -s ours am: 49b0ddfa35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id12f9012bfd172c0b18be692eccd1b536a35bf74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:02:52 +00:00
Bill Yi
14d92615f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39549af0ee -s ours am: 8aa42b38f1 -s ours am: 8ae70b98a7 -s ours am: 1e7027a535 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8f28d4e9b17170b1602dbadaf9a347e09d5755e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:02:07 +00:00
TreeHugger Robot
b1eab4c43f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b18172156 -s ours am: 028f4ca3e4 -s ours am: 5c2b9f3a53 -s ours am: 6c7a3a891d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb48359b03ae0bd8f7dddd734ee958bbc0911150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:01:02 +00:00
Bill Yi
d5dac55357 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9548c9c54f -s ours am: 339af2b104 -s ours am: c48a4fd0f7 -s ours am: 7c1b9a73fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6801f172d5794310dcae5718420ef61f967a54f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:00:28 +00:00
TreeHugger Robot
12f63b929e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e729110c1c -s ours am: 9aa0794c10 -s ours am: 56d3b59152 -s ours am: 47100cca89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic37feb176abf81fb34ee7697e964ec2814bafe22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:00:08 +00:00
Bill Yi
fed5a462cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c6f1ef3f16 -s ours am: 603aed67aa -s ours am: 11758a877d -s ours am: 85a56b59c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic255556bb395d93d316171690983813df79bcd47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:59:51 +00:00
TreeHugger Robot
32d7cdbc48 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dcd4eaf6d -s ours am: 715397afc1 -s ours am: bbf3f7e37e -s ours am: b650e1f6df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9ffc5087f29c64932f9670c3c9a7f585f8b690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:59:33 +00:00
Bill Yi
ee40030f8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 753d359ba4 -s ours am: 3b6eaedf8e -s ours am: 226794a1a6 -s ours am: e5e8d737da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibcf282e68f2a91da3025c555a56a5d2640154d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:59:13 +00:00
TreeHugger Robot
06657c7603 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e1ef674e6 -s ours am: 9bced8a258 -s ours am: 5a6418621a -s ours am: 7732f406f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7f5a018925a10082d15e8a285fa5e1fdf4d58be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:58:25 +00:00
Bill Yi
ef6dde701b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c28e97f85 -s ours am: 88eb6e7d47 -s ours am: 1c1eba35dc -s ours am: ddf91037cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ca97eab25879c7d9c0909495e3b9516e374b91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:57:32 +00:00
TreeHugger Robot
5f4cb717b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 28da1d0f58 -s ours am: 316757d53c -s ours am: f8e56c8753 -s ours am: 724a104d3e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I348d62b8989e7384f7ee66f342a5ae49eeec5d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:56:24 +00:00
Bill Yi
4cfa2218c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efbb91582e -s ours am: 753e64492b -s ours am: b43826c273 -s ours am: 4eb383b098 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd81e06e44e1de4db06952b4d194f12600a34a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:55:58 +00:00
TreeHugger Robot
0a887060fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7278cd68af -s ours am: 13f6d78e0c -s ours am: b50edb4426 -s ours am: 77d586670c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I51cb39dabb30e59cb8c69239e3ea56757c3c8058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:53:37 +00:00
Bill Yi
c770e31ae2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bed84b2781 -s ours am: d5618d8197 -s ours am: 132889ae34 -s ours am: f8b1f8e2eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12588ef9e4d1c4e647ed2436d0a4c63b164bee8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:53:02 +00:00
TreeHugger Robot
bceb6a3e99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: feed41298c -s ours am: ae247d2d1d -s ours am: 040555306a -s ours am: e5b3ffe3b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0e3080a339b2e3b14736a74ea500e0842210bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:52:23 +00:00
Bill Yi
cfa85fb892 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d602d42449 -s ours am: ce48f0fd6a -s ours am: a21ee2a97e -s ours am: 68de05a358 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75e26d4a75dd1bbff9ec194d38c8872a9c06e3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:51:44 +00:00
TreeHugger Robot
2a7c287ee2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c407ffa3e5 -s ours am: b94dd3e25a -s ours am: 5f1ca27464 -s ours am: a451bfdafd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icac2e394419fe44d5d5452bd7e20549ff794c103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:50:59 +00:00
Bill Yi
68c7857c17 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 868a4d146a -s ours am: f2b0ca69de -s ours am: 2a93e99ab5 -s ours am: 6fe00b8e1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b0a4bd95d76b6f299a23b1151eea20dc1969c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:50:41 +00:00
TreeHugger Robot
6a5dc94b63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 079f53a194 -s ours am: 08bee7de0f -s ours am: 15ed531aaa -s ours am: a562617c0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f82f78be937d73ad05a62b5fe31f881965582db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:50:19 +00:00
Bill Yi
86895349e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d02dd73053 -s ours am: 77d9bbe21f -s ours am: b10b000daa -s ours am: 84f83452a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53657f3651bd4c3d59cbf2f5cf38756c90937f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:49:34 +00:00
TreeHugger Robot
5b9b2a588f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 32753e487d -s ours am: 097d43ee6d -s ours am: 57a287d386 -s ours am: 78cec2ac86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43de45ad2ed1874f08a582e0e0ba9d92eed092f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:48:48 +00:00
Bill Yi
2e43e1b4b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 805ac6e1d6 -s ours am: 8330ec00e1 -s ours am: 6d0dfc2a6d -s ours am: 9d43b1378c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03ab1156f9199d88bb71fb1f022f59044c337dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:48:32 +00:00
TreeHugger Robot
5bd96452d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 51c9e4e023 -s ours am: 063483ea7b -s ours am: b55a0fbff2 -s ours am: 2003c4e32d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e086086dbcd476a81bb65df073449ba3f447b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:48:08 +00:00
Bill Yi
ef5c0168f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55d44d7f66 -s ours am: cd934f6c90 -s ours am: 558aaebbfa -s ours am: b2ae0b9441 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1a9397f2d7963ecc660fd57c2f87796e9dfa206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:47:24 +00:00
TreeHugger Robot
ea370ca2f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 422a5dfeb4 -s ours am: 4a0c20ac0a -s ours am: 33bee3655d -s ours am: 977e843c0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I516082f0c9a1d43b12a3b237f3e3a3770759ebb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:44:49 +00:00
Bill Yi
c9a4cb2143 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 116dfdb779 -s ours am: 3be96412c6 -s ours am: 2c4546688b -s ours am: 46387a187f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97f77fe5eb76ad96896cf770cff94e85de42ed86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:44:19 +00:00
TreeHugger Robot
98566b0190 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34e4bc07e7 -s ours am: e090febc7c -s ours am: 8e98196a00 -s ours am: 4e9784f88f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b6dd994af602cba849a8292c904736efd2c07f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:42:32 +00:00
Bill Yi
aa63a41c6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2348782a2 -s ours am: 1e05e4aec3 -s ours am: 6809203ff7 -s ours am: 9c5f98353c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07a73c387c9d1236d646d5e2e21a9d7f86d8f06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:41:50 +00:00
TreeHugger Robot
83432bb185 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 075f9ceed2 -s ours am: 29e396f6a2 -s ours am: 3eb475aa10 -s ours am: 93531234d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fb21ae1df18a01a0209de7841754a1877323d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:41:10 +00:00
Bill Yi
3fbecb6bc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3429b29ce3 -s ours am: ec7ca8e05a -s ours am: f55a2f4f95 -s ours am: e634288270 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68200b04e40468ed42fd7265c94b19d5344d9fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:40:39 +00:00
TreeHugger Robot
4a60145b65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55280a3b18 -s ours am: 1f33be5083 -s ours am: efa25714bf -s ours am: 9997afdbee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54d0753fc67a8b6e50e8e8add9fc432b379b3c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:40:15 +00:00
Bill Yi
bd874cba6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3da8cb0bd -s ours am: 008a520106 -s ours am: 9bcd6dbe45 -s ours am: bdbf33214f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifadd068816c588b571642a8588c03755700280ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:39:51 +00:00
TreeHugger Robot
4928c7573a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e495ec6635 -s ours am: 29d34d8876 -s ours am: ac11a806b8 -s ours am: e32d089d69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ebcb1749206a16bc8c8990601d3382ff22d55c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:39:16 +00:00
Bill Yi
22e145f461 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a0d129a4e -s ours am: 6b60cf2f32 -s ours am: 049280d5af -s ours am: 91c4d8a92f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41b60bdb8b49cbf199ae1a0ba6dc54a0ae5836cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:38:41 +00:00
TreeHugger Robot
36177d728f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 9b4cb6ab33 -s ours am: fca2f2276c -s ours am: 4cad86e995 -s ours am: db5870af54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8aec28d0e6c863df1fce2fd6d9f6280834cd24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:37:58 +00:00