PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,461 Commits 1 Branch 0 Tags
6740cc4d17cfe6bb75a7bf99aff6914b7e79f7af
Commit Graph

110461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
5a1b237f96 Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours am: f9c6f838d5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours am: 3369ba127b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours am: f71bb3a8cb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours am: dfe3cc520b -s ours
 2022-06-02 14:46:17 +00:00
TreeHugger Robot
1d65bf6b9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours am: f9c6f838d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: Ia256a9927d8999fdc6b9dcd340eef40b5a4fda54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:45:52 +00:00
Bill Yi
5888a02f53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours am: 3369ba127b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: Ida36c3c65b76ff9cf40a90bcf35668c48316e4bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:45:28 +00:00
TreeHugger Robot
9acee87e9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours am: f71bb3a8cb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: I1af87a3970d0b1b5e61d1fad97a9efe99dec308d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:45:06 +00:00
Bill Yi
55e29911cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours am: dfe3cc520b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: I9fd09a0d13cf77b7fbe0e7785be169d2e3b37d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:44:45 +00:00
TreeHugger Robot
13135f12ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours am: bddc73bc19 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: I2fd546c3324ebba588126fe6f5fbbf785bd77f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:44:24 +00:00
Bill Yi
dca279143c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours am: d2454198f5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: Ib4f5ebc6cbeb7e156824af689858c269bba37ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:44:03 +00:00
TreeHugger Robot
d44d813bfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours am: 37b8f2deeb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: I711a2740165b1ad3e75035858af87f01c2d0c396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:43:41 +00:00
Bill Yi
e11b1b89cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours am: 048fedac8f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: I4a625041d889694c3ca3d550877e612a67e31cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:43:17 +00:00
TreeHugger Robot
f9c6f838d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: Ib67c4c4f732d9af6389de9004a3ecf8266eea680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:32:04 +00:00
Bill Yi
3369ba127b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: I9193698072c95ce2939d1cdbbcab8cb46d174e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:31:38 +00:00
TreeHugger Robot
bddc73bc19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: Ib11f0b22f8f564c8694eb45881c5bcacf6538342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:31:22 +00:00
TreeHugger Robot
f71bb3a8cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: I10f381599969a86e316f77b9c38f87a940d09747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:31:16 +00:00
Bill Yi
d2454198f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931

Change-Id: I81256a9b9656540f41a40b91d4164fd372b8cd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:31:05 +00:00
Bill Yi
dfe3cc520b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: I0b38733a630385012b5ab96f09ff43b2ae402236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:30:57 +00:00
TreeHugger Robot
37b8f2deeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: Id37f54470bc3c818ad8df51170b2d58508cc1dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:30:40 +00:00
Bill Yi
048fedac8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630

Change-Id: Ibc8932330838ad505038f32648734ecb6d865231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 14:30:15 +00:00
TreeHugger Robot
81d673b4cf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-02 14:04:06 +00:00
TreeHugger Robot
0d203757d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-02 14:04:06 +00:00
Bill Yi
afbfdd99a6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-02 13:59:42 +00:00
Bill Yi
92e6aa76a8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-02 13:59:42 +00:00
Automerger Merge Worker
c0404941a8 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 am: a0793dd4e1 am: 27785346c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I9e8d17abd61055e96b193c5c2a78e9f58ea347f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 12:48:24 +00:00
TreeHugger Robot
958c9879f0 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 am: 812dc9fa16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: Ie575c947482bc61e8ffdd5ae31cc59375f8707d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 12:48:09 +00:00
TreeHugger Robot
99638e03f1 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 am: 886cf58541 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I86f654a1bda6b14d6ce6416ca797178cda043359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 12:47:00 +00:00
Automerger Merge Worker
27785346c8 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 am: a0793dd4e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I80b392b28dce94f1b1ff884ea0ab71e522a86520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 12:23:52 +00:00
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
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: 2dd22a060a -s ours am: bf8f3193d9 -s ours am: 9d02540241 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours am: c527092d8b -s ours
 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