Bill Yi
|
22498ea9e5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82eb35a9a3 -s ours am: 43867f2277 -s ours am: 8be3518304 -s ours am: 1a50377005 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687410
Change-Id: I3d5fa43722d85e8e3cd68e058f6537a1f4f94895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:55 +00:00 |
|
TreeHugger Robot
|
960a27c30d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bf57a61c80 -s ours am: b2ab068c31 -s ours am: 9cf61985f8 -s ours am: 1960f5a22b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687161
Change-Id: I61a299b05784513d7ee33da2a766930d880a208c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:50 +00:00 |
|
Bill Yi
|
ab8c245fd7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c61738b26 -s ours am: 29ce3a9d54 -s ours am: a3129ff315 -s ours am: 9516f4ab6b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687161
Change-Id: Icc49a1b6b0d967e7a4c86477f76199fbab4d7311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:46 +00:00 |
|
TreeHugger Robot
|
0d301048cb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b5981da259 -s ours am: b2490fa8b4 -s ours am: 988555c0ef -s ours am: cab78cdf59 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687127
Change-Id: Ia9de24497e006da421aec7bd5a1a346991bb6b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:42 +00:00 |
|
Bill Yi
|
cea7e3dfb7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a85c40bb05 -s ours am: f0c1144f76 -s ours am: 5eb5485c84 -s ours am: ccaeb26cd3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18687127
Change-Id: Iaea0bbe7ff2dae40a3aac5432601cf40ae4f0848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:36 +00:00 |
|
TreeHugger Robot
|
740f80fefc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3a6d5854db -s ours am: 375d1f6452 -s ours am: 72c46b79f1 -s ours am: efc48f58d7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18686064
Change-Id: Icb74e33d8810826b3646224e4c822a4862d197a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:30 +00:00 |
|
Bill Yi
|
f76c105c92
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f964262907 -s ours am: 828dd3844c -s ours am: 7c708b7382 -s ours am: 6c3443143d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18686064
Change-Id: I8d94e252743a6f3dc4efbf59a05c75aa761ec5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:21 +00:00 |
|
Bill Yi
|
24c98a9a33
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bbe809409 -s ours am: d3492fb52c -s ours am: e6f11e598c -s ours am: 4e8e996915 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18675211
Change-Id: I1a14b5713833f8e15a186f80877c6001a2e444f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:05 +00:00 |
|
Automerger Merge Worker
|
9b59009ec3
|
Merge "[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 5b060c236a -s ours am: 8974fef6e9 -s ours am: a2b313aecf -s ours am: 21bc5de8b0 -s ours" into tm-qpr-dev-plus-aosp
|
2022-06-24 01:50:13 +00:00 |
|
Automerger Merge Worker
|
7ae0c02516
|
Merge changes from topic "am-b8e53481406d4cfbbf878e7249a82bb8" into tm-qpr-dev-plus-aosp
* changes:
Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours am: a3452e4286 -s ours am: 6b7d2d10ba -s ours am: 3aa32715aa -s ours" into tm-d1-dev-plus-aosp am: c25f0fe031 -s ours
[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours am: a3452e4286 -s ours am: 6b7d2d10ba -s ours am: 3aa32715aa -s ours am: d57b1c21f0 -s ours
|
2022-06-24 01:50:11 +00:00 |
|
Wenhao Wang
|
1c27bb1fd9
|
[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 5b060c236a -s ours am: 8974fef6e9 -s ours am: a2b313aecf -s ours am: 21bc5de8b0 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659051
Change-Id: I21671ec3ee459525ff00ee967655c42e6bd7f724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:07 +00:00 |
|
Automerger Merge Worker
|
78f9196379
|
Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours am: a3452e4286 -s ours am: 6b7d2d10ba -s ours am: 3aa32715aa -s ours" into tm-d1-dev-plus-aosp am: c25f0fe031 -s ours
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408986
Change-Id: I05357b49e0f111fa20b864ca3e6dd03c55f33fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:05 +00:00 |
|
Manjeet Rulhania
|
9793774015
|
[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours am: a3452e4286 -s ours am: 6b7d2d10ba -s ours am: 3aa32715aa -s ours am: d57b1c21f0 -s ours
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408986
Change-Id: Ifff8f2fdbb30aa7cdefe166f7eb5a325b9f3b311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:02 +00:00 |
|
Julia Reynolds
|
d3ba1c61f0
|
[automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours am: 1d6e5eb785 -s ours am: ebb1a21f01 -s ours am: 2fcd6ded38 -s ours am: 7f4c172fdb -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625677
Change-Id: Ia2568d2d3f66574206170aaf768e8cb2ad9b3f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:49:56 +00:00 |
|
Julia Reynolds
|
15bfd28d79
|
[automerger skipped] Move service initialization am: caa5a22ea0 -s ours am: 2ee5edda84 -s ours am: 39711c9dd7 -s ours am: 8e73531d6d -s ours am: eb114e53da -s ours am: 30d6250e13 -s ours am: 916ecb969e -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577100
Change-Id: I18e6c7ca9e02c8c0647eb5242e98734686c18d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:49:44 +00:00 |
|
Julia Reynolds
|
e10732c021
|
[automerger skipped] Move service initialization am: 14d7f081c8 -s ours am: 56822a2cbb -s ours am: 2b5308869a -s ours am: ad59955498 -s ours am: da7a55fe24 -s ours am: 6df01781e6 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6af7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589711
Change-Id: I13f62ac0a9d4f753f66f4579c98d5c6f23ce8b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:49:29 +00:00 |
|
Automerger Merge Worker
|
3877dc8352
|
Merge changes from topic "am-4a94c5aa144e4bda8edcbb2f691333dd" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e23 -s ours am: 4bb4859149 -s ours am: 4874a851f3 -s ours am: 04823598d8 -s ours
[automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce am: 8657d8e59b -s ours am: 75cb925622 -s ours am: 86021107e6 -s ours am: 7d76408e1f -s ours
|
2022-06-24 01:49:07 +00:00 |
|
Hui Yu
|
700e0acc4f
|
[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e23 -s ours am: 4bb4859149 -s ours am: 4874a851f3 -s ours am: 04823598d8 -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892
Change-Id: I136991c2d0d022fa4b9e1b18ee63ffd4c8cc41b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:49:02 +00:00 |
|
Presubmit Automerger Backend
|
005edd6db1
|
[automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce am: 8657d8e59b -s ours am: 75cb925622 -s ours am: 86021107e6 -s ours am: 7d76408e1f -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892
Change-Id: I411d2a49c24dcd5c2b2fbf557199bfa63ca18053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:48:58 +00:00 |
|
Julia Reynolds
|
45c010340e
|
[automerger skipped] Move service initialization am: d262fa6af7 am: 8ae47ac5ff -s ours am: 906a75d79d -s ours am: 0fba38aa91 -s ours am: b3e5310e24 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 8e278543bd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589618
Change-Id: I9ec6026cdc408fc9dff6a3f6613dc0d6f5da28e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:48:53 +00:00 |
|
Brian Julian
|
812c1538f2
|
[automerger skipped] Add a permissions check to LocationManagerService. am: 8daa702451 -s ours am: 93170aab3a -s ours am: ed035adebc -s ours am: ca54f6817a -s ours
am skip reason: Merged-In Id591cd39ed7813c649b44d4a3210f0b1fb79b40d with SHA-1 d1e6b59356 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322259
Change-Id: I43818691fdf1426b5b70bc7b2c6a1f1162831a52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:48:44 +00:00 |
|
Automerger Merge Worker
|
f7722d8844
|
Merge changes from topic "am-fff65bf311764194ac266fe45e89521f" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bbef4c0955 -s ours am: 8d63bd8eb1 -s ours am: 2c30e9f391 -s ours am: 765e3e7a39 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: df04cd30e5 -s ours am: a80fec6e06 -s ours am: dc9ec47637 -s ours am: 7c24556c42 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3cbfa81549 -s ours am: d2f4a1f445 -s ours am: b968b4ca42 -s ours am: b8fc8b2bf1 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 045c96704b -s ours am: be971af08a -s ours am: 7e2b3d127f -s ours am: 8c2e63ff43 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 17ceefbe57 -s ours am: 5831f3ce8a -s ours am: bb53e09ae0 -s ours am: fc1c949c48 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eeff5702ce -s ours am: 756d874eb7 -s ours am: 52c7e36442 -s ours am: ab50492f26 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 95b96e8b15 -s ours am: 4eb8feacd9 -s ours am: 777ce948e4 -s ours am: 578edbd4db -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee77d155f4 -s ours am: 103547aaea -s ours am: 044b231f64 -s ours am: cd1c8b97a6 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: dd7576e199 -s ours am: 5a57c35d4d -s ours am: a43bb5debe -s ours am: 083de3a265 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5231a8c5fb -s ours am: 3f9da8b71a -s ours am: 72611f306c -s ours am: 5965231291 -s ours
|
2022-06-24 01:48:38 +00:00 |
|
TreeHugger Robot
|
de7fbcba82
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bbef4c0955 -s ours am: 8d63bd8eb1 -s ours am: 2c30e9f391 -s ours am: 765e3e7a39 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513340
Change-Id: Ib6d1463e16ca2d23f55c4bfe47b29ae74fd96245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:48:19 +00:00 |
|
Bill Yi
|
60380da87f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: df04cd30e5 -s ours am: a80fec6e06 -s ours am: dc9ec47637 -s ours am: 7c24556c42 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513340
Change-Id: Ia485224400c1c597fae5fffcb0753d1f8bd6627a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:48:13 +00:00 |
|
TreeHugger Robot
|
729170c4ce
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3cbfa81549 -s ours am: d2f4a1f445 -s ours am: b968b4ca42 -s ours am: b8fc8b2bf1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513124
Change-Id: I8e887ed2cd6ab986c028ff2c2af2e1d7ef83a865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:53 +00:00 |
|
Bill Yi
|
e1105b0569
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 045c96704b -s ours am: be971af08a -s ours am: 7e2b3d127f -s ours am: 8c2e63ff43 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18513124
Change-Id: I7b8332e90a31ba0d34265f1dc94ea3cf07d153f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:47 +00:00 |
|
TreeHugger Robot
|
f4295e9895
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3f0476bac0 -s ours am: 6809072d3b -s ours am: 248f53dda4 -s ours am: e6f2283522 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437663
Change-Id: I5dbe05394d7a878b48a699e3080f8cf31657c736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:43 +00:00 |
|
TreeHugger Robot
|
ed925175ba
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 17ceefbe57 -s ours am: 5831f3ce8a -s ours am: bb53e09ae0 -s ours am: fc1c949c48 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18512859
Change-Id: I4709e05d5f15f2243dcbf4493d59ca7e36d4d189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:42 +00:00 |
|
Bill Yi
|
833cb238ff
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 207eed7ac9 -s ours am: bffdec03bc -s ours am: 2e33560a05 -s ours am: fe43515ee7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437663
Change-Id: I25231e02f500bb770cde65612534828e529e08b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:40 +00:00 |
|
Bill Yi
|
43cf328511
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eeff5702ce -s ours am: 756d874eb7 -s ours am: 52c7e36442 -s ours am: ab50492f26 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18512859
Change-Id: I3c8fc165fea51e370267d5f11dcc38d58a41eb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:37 +00:00 |
|
TreeHugger Robot
|
0b214831bc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 534abbe2c2 -s ours am: 6a17ca1c00 -s ours am: 0f598338d6 -s ours am: b0cfecf168 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437029
Change-Id: I9805f17e7306251b7114466a3b4c2ef08abd4dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:36 +00:00 |
|
TreeHugger Robot
|
5578fed8b5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 95b96e8b15 -s ours am: 4eb8feacd9 -s ours am: 777ce948e4 -s ours am: 578edbd4db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18512380
Change-Id: I4fabe37cc560efe693ed0433b13824d4c1fa379d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:32 +00:00 |
|
Bill Yi
|
32adcd57d2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5045c879e3 -s ours am: d08334ac93 -s ours am: 2987def230 -s ours am: 883208d3e6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18437029
Change-Id: I8ca9e5002467ae362590fdef26d4829fb3e6bc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:32 +00:00 |
|
TreeHugger Robot
|
468c58da28
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6dcb367f52 -s ours am: 975062a2ba -s ours am: a20f85fb25 -s ours am: dd96413ca8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432097
Change-Id: I24d6616d3f1508adbee7e2c26e8b0ea1166eab23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:28 +00:00 |
|
Bill Yi
|
962023ec3d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee77d155f4 -s ours am: 103547aaea -s ours am: 044b231f64 -s ours am: cd1c8b97a6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18512380
Change-Id: I2b0e60ac3caf9ce59f02cc7ec6ec760876be17d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:25 +00:00 |
|
Bill Yi
|
174d98d8dd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7d89bf544 -s ours am: e6e6094493 -s ours am: fbea4b7b15 -s ours am: fb20540ebe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432097
Change-Id: I589c06e1a874fec142e3683b40c675d00aa166d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:25 +00:00 |
|
TreeHugger Robot
|
b56282d094
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 41260e7be4 -s ours am: 9ec8345314 -s ours am: 2f3e8ca05a -s ours am: bc42359f75 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425602
Change-Id: Ie372e4f1362b041b8a12da7f02d75c325423aa48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:22 +00:00 |
|
TreeHugger Robot
|
6fc8e26e02
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: dd7576e199 -s ours am: 5a57c35d4d -s ours am: a43bb5debe -s ours am: 083de3a265 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501622
Change-Id: I28ab30d0b6aecb0fb7d909815634f2e9847553c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:18 +00:00 |
|
Bill Yi
|
8c02e20870
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b90e218ba3 -s ours am: ba02e47c8c -s ours am: 6b7c2844d6 -s ours am: c094e00d58 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425602
Change-Id: If91ef20b15f5a22e798a54c331f3ccb00d7408b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:17 +00:00 |
|
Bill Yi
|
148d36752f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5231a8c5fb -s ours am: 3f9da8b71a -s ours am: 72611f306c -s ours am: 5965231291 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501622
Change-Id: I450836f05b7eaa9c98e1ac42e5376b606f978b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:47:03 +00:00 |
|
Automerger Merge Worker
|
b2adb8fc1e
|
Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours am: 043d3bd55f -s ours am: f642349402 -s ours am: 63d40c496e -s ours am: 64ef08037b -s ours" into tm-d1-dev-plus-aosp am: 1a15aef46e -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: I4ebf3d1fafdbdc3a93103ab4e89ca6049888f4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:46:46 +00:00 |
|
TreeHugger Robot
|
6d39b3cade
|
[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours am: 043d3bd55f -s ours am: f642349402 -s ours am: 63d40c496e -s ours am: 64ef08037b -s ours am: 92b3dac8dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: Ib4708637a46740c730dff42f067da935289dc898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:46:43 +00:00 |
|
Brian Julian
|
9426d6dd6c
|
[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into sc-dev am: 3fe61746df am: 5c9304987f -s ours am: 1171cda75f -s ours am: 2402a7bb84 -s ours am: 938285dc69 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041
Change-Id: I78c799a6bbe328424ac1f2780ae29d008df7d39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:45:57 +00:00 |
|
Automerger Merge Worker
|
4be9c86ebe
|
Merge changes from topic "am-c4b7e98f4fc245ecb0cf89b442518c86" into tm-qpr-dev-plus-aosp
* changes:
Merge changes from topic "cp-sc-dev-222473855" into sc-mainline-prod am: a42bd43183 am: ff2773b0d5 am: 0fe59ac789 am: ef1f758fba
[automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9fd am: df70a82494 -s ours am: 380a1c8bf1 -s ours am: 44f4936c41 -s ours am: e1f8d126e7 -s ours
|
2022-06-24 01:45:47 +00:00 |
|
Brian Julian
|
62728ada35
|
Merge changes from topic "cp-sc-dev-222473855" into sc-mainline-prod am: a42bd43183 am: ff2773b0d5 am: 0fe59ac789 am: ef1f758fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041
Change-Id: Ifd445f2e805c2d12ab28a9bcb87334b5074f68b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:44:53 +00:00 |
|
Brian Julian
|
f649a5dce5
|
[automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9fd am: df70a82494 -s ours am: 380a1c8bf1 -s ours am: 44f4936c41 -s ours am: e1f8d126e7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041
Change-Id: Ie4e01cc1f37177890fcc638e78df42c973087656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:44:33 +00:00 |
|
Automerger Merge Worker
|
a075832f33
|
Merge changes from topic "am-282315e63a6c45dd91fff7130cffc35b" into tm-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-2201364a6cf442e88b472c0e36774c37" into tm-d1-dev-plus-aosp am: f0f488c470
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3d29ee649b -s ours am: 8cd3075caa -s ours am: e3165b2e4e -s ours am: b9a809acd3 -s ours
|
2022-06-24 01:43:19 +00:00 |
|
Lucas Lin
|
fa15bedf71
|
[automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 054b17e930 -s ours am: cf65e89055 -s ours am: 527a4f9f74 -s ours am: 63dfa62beb -s ours
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 65d44b93bb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994
Change-Id: I3dac5ec274887f888b54e6337283ffed5968c162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:43:04 +00:00 |
|
Automerger Merge Worker
|
9f793ced0c
|
Merge changes from topic "am-2201364a6cf442e88b472c0e36774c37" into tm-d1-dev-plus-aosp am: f0f488c470
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18397359
Change-Id: Ie0fcdfafeff4dd3669199fe77eb74b7162f97f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:43:01 +00:00 |
|
TreeHugger Robot
|
94831c8449
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3d29ee649b -s ours am: 8cd3075caa -s ours am: e3165b2e4e -s ours am: b9a809acd3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18397359
Change-Id: I6d1230dbda739af32dee6dc94d8f50d1567c6302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:42:48 +00:00 |
|