TreeHugger Robot
812dc9fa16
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: 3ff3ace823 am: 453c1abc25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I7522dbf55aad11bf93040b6004d63e98ae0d71a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 12:23:32 +00:00
TreeHugger Robot
886cf58541
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: 3ff3ace823 am: e4a5991f5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I3e7a06ff3fe933106ec3396f938a235370e07dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 12:23:13 +00:00
Automerger Merge Worker
a0793dd4e1
Merge "Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: fbae601cb2" into tm-d1-dev-plus-aosp
2022-06-02 11:59:58 +00:00
TreeHugger Robot
453c1abc25
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: 3ff3ace823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I81774efba0f4319ab89572ebd5eecd4485628480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:59:55 +00:00
TreeHugger Robot
654e9a60fc
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: fbae601cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I5e057691e1ee75cf0c32985da5338710f95f40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:59:55 +00:00
TreeHugger Robot
e4a5991f5e
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: 3ff3ace823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I576c7d7e3d4b3c86e9f92838822d5ddda50bacf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:59:52 +00:00
TreeHugger Robot
6747d28f7d
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a am: d7fcc775e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I917c425aba5ab872b525cb93519599d42afa34d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:59:22 +00:00
TreeHugger Robot
3ff3ace823
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I6bad482c52f4111d402d052db2261ed895b273b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:36:07 +00:00
TreeHugger Robot
d7fcc775e5
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ie3454fc7d19ab078f4c07038eb8132c6e136171c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:35:08 +00:00
TreeHugger Robot
fbae601cb2
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca am: 1ef5a1c86a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I9e3864b6225526ce72620b5af9e718b2512d0397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:34:45 +00:00
TreeHugger Robot
1ef5a1c86a
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640 am: e6ee0ba1ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Idd1b1e42bacbb74d950d9aa9a367b0f3a9fe176c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:18:16 +00:00
TreeHugger Robot
e6ee0ba1ca
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I38e251a90df0d85b02e4a90e60434374caebb43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 10:56:20 +00:00
TreeHugger Robot
98ec16435b
Merge "[Le Audio] Remove the redundant resId"
2022-06-02 10:42:51 +00:00
Tsung-Mao Fang
902104856f
Show full package name in cred app
...
When RequestManageCredentials of the Settings app
is processing the package name in the user consent dialog,
it does not properly display the package name information.
This makes users could grant permission to a malicious app.
Test: manual and see full package name.
Fix: 231159843
Change-Id: I4c4ebe6199f6d9ab3b2e567daea0e8b2119387b2
2022-06-02 10:00:51 +00:00
TreeHugger Robot
b2a6f3b640
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Iea8346aa727c8ca1b9ccf7511e4c360c559c94c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:40:00 +00:00
Automerger Merge Worker
154b8be102
Merge changes from topic "am-6b6766895f7d47fcad089b02790bcf29" into tm-d1-dev-plus-aosp am: bca5f228a3 am: b59a851d67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I60fb8fffd1a0b2014b4ef1e96cb9f0e4f87dec37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:38:17 +00:00
TreeHugger Robot
c93fc57ab6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: 5814c94856 -s ours am: 5c022f10e7 -s ours am: c224165414 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I832e34292fd1c87ccf51dfc2980af36ca82d7df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:38:00 +00:00
Automerger Merge Worker
25e7841d2a
Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into tm-qpr-dev-plus-aosp am: ec751c2b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I059eee2a993b8cd469395ab49bdc3ba039a90c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:33:11 +00:00
TreeHugger Robot
058f7587ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -s ours am: 9d02540241 -s ours am: 26e9df8c76 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Ifc5e03c26f47e1d4042bcfaf6d27311b50fa9a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:32:52 +00:00
TreeHugger Robot
1bf8fec78a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -s ours am: 573678bccc -s ours am: 26f6b62b16 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I5543d0763a7f6b52389fda3608058ad0696daddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:24:21 +00:00
Bill Yi
1930f4ae90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours am: 5edb7526a5 -s ours am: 73e15cafd4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I46d21842c862dddf6ae40f97ff0e0726b73b564d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:24:03 +00:00
TreeHugger Robot
2e68c87afc
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I8d59841265494fc6b1e1b280c6c275c4103959be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:13:52 +00:00
Automerger Merge Worker
b59a851d67
Merge changes from topic "am-6b6766895f7d47fcad089b02790bcf29" into tm-d1-dev-plus-aosp am: bca5f228a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I7cae3e491a2db29ffb04acca4466eebe9580b40d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:04:04 +00:00
TreeHugger Robot
c224165414
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: 5814c94856 -s ours am: 5c022f10e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I4f219808bafe19f1403c3aaaaf6e438fcd87cb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:03:48 +00:00
Automerger Merge Worker
ec751c2b98
Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060abf8f3193d99d025402414a398405a2f8a50b4b89c527092d8b
2022-06-02 08:01:45 +00:00
TreeHugger Robot
26f6b62b16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -s ours am: 573678bccc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I6aecf5505806657f33c06db2204a7b5f8c7733d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:00:01 +00:00
TreeHugger Robot
26e9df8c76
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -s ours am: 9d02540241 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Ia2393727602390972a3533c4abc2405a0d133361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:59:54 +00:00
Bill Yi
73e15cafd4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours am: 5edb7526a5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I5f82ca055380444ad2412b2996d917e518a8a0a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:59:44 +00:00
Bill Yi
68e95da551
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours am: c527092d8b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Ifeb366b252f531b245376391e51399af383a2eff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:59:36 +00:00
TreeHugger Robot
165c11c0da
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I808a8ab16e700325ec93b028e22a58215fbdbbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:58:27 +00:00
Automerger Merge Worker
bca5f228a3
Merge changes from topic "am-6b6766895f7d47fcad089b02790bcf29" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a5814c948564a398405a29f3d909380
2022-06-02 07:38:24 +00:00
TreeHugger Robot
9d02540241
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I00f0abb7ca23576dbe4c4e7a0ef2987935cf5688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:37:10 +00:00
TreeHugger Robot
5c022f10e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: 5814c94856 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I13ac6b543e621fd0026a832deabec51a28c8badd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:36:57 +00:00
Bill Yi
c527092d8b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Ia0ea3cc2bcfe6a0ffa5184e5f4c0057b7bc3788d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:36:52 +00:00
TreeHugger Robot
573678bccc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: bf8f3193d9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I17d8693faacdf52716481d6091b5cc33b5bc5325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:36:42 +00:00
Bill Yi
53a0ea397e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: 9f3d909380 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I6e204d199cc0a79269319d37c65ceb54b6fe7b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:36:41 +00:00
Bill Yi
5edb7526a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I8d8497a1d6da4831233f63ff6881006e1a44e767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:36:25 +00:00
TreeHugger Robot
6fd7cf1993
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I6c7835e9885cf02ba167a8f4ac1c564bad511e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:34:09 +00:00
TreeHugger Robot
f4222dcc73
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: 5d47633192 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Iaf07e2725ee1f2fb548b1ac660ae95c6ae0fa6a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:27:53 +00:00
Bill Yi
3e24500fcd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f52d81e8cd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Ic1541fff9375593cc72782ce20a69770663450b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:27:37 +00:00
Zoey Chen
09b6827884
[Le Audio] Remove the redundant resId
...
Test: manual
Bug: 214340362
Change-Id: I41dc198384a1b1f67b009f38907fb84eb754c3c0
2022-06-02 07:19:51 +00:00
TreeHugger Robot
e3bbadb7df
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:15:36 +00:00
TreeHugger Robot
bf8f3193d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I45c604d81e17f32008d09e8d6268f7ff98c812ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:53 +00:00
Bill Yi
f8a50b4b89
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: Ie867abf082d0eb78a26650398c2a8ad89ccdb68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:36 +00:00
TreeHugger Robot
5d47633192
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: If2a0f2689e3926da7ab3104ef2e6e25e7fd5b5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:26 +00:00
Bill Yi
f52d81e8cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I105bce0dac4f64afb5953259df915d4d4782492a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:09 +00:00
TreeHugger Robot
5814c94856
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I74bffca5423b7133667656b3b5c51414c4116b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:03 +00:00
Bill Yi
9f3d909380
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I36c79903c3627740db02324ee6623160773505c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:01:42 +00:00
TreeHugger Robot
2f184b0ff4
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev
2022-06-02 06:52:53 +00:00
TreeHugger Robot
2dd22a060a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-02 06:41:58 +00:00
