Commit Graph

116336 Commits

Author SHA1 Message Date
Arc Wang
f474582ada Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1 am: 9f04b02571 am: 9a2052945a am: 7b7c62d78a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: I7b06e7905c0556428bf0453e7a7e8d35013a8b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:54:48 +00:00
Arc Wang
7b7c62d78a Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1 am: 9f04b02571 am: 9a2052945a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: I69f24f5a63070e84af70bd050dca789ef34b16ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:26:01 +00:00
Milton Wu
85b6cd3d58 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours am: 8da95c29a9 -s ours am: 14ed9ab1c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic757903cdca37b7926ec224db9a946b110913088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:25:45 +00:00
Milton Wu
8a5b173b37 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours am: ed094b353b -s ours am: 529896f004 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3dc3665dd07c92df79ee91b4e28b3812974bb971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:25:36 +00:00
TreeHugger Robot
918f7e6c36 [automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c am: 9983c28b67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie99935fce846f3e02e65f6a2c3a0b8a967c3475d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:25:27 +00:00
Milton Wu
7aa34f8531 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f am: 4cc7080b4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If880e7799503fd75f8050db37b20f9766b9eec9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:25:24 +00:00
Milton Wu
14ed9ab1c4 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours am: 8da95c29a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I116c387de73cb514b83ba05fdbf47512e331a790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 04:23:49 +00:00
Milton Wu
8da95c29a9 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If075061207ed359f26ec3a597792329d77bc537a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:53:17 +00:00
Arc Wang
9a2052945a Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1 am: 9f04b02571
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: I03210d69ecb91b8f98a8182a2954d8d9799d023a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:45:00 +00:00
Milton Wu
5561341091 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:42:15 +00:00
Milton Wu
529896f004 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours am: ed094b353b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c01bb7bf2c8f825f14529505f9927b61b111178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:42:07 +00:00
TreeHugger Robot
9983c28b67 Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ic8aa190849303e9684657fd67fc93a010e270b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:41:52 +00:00
Milton Wu
4cc7080b4f [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ib9ad45c802a510fbd6bac8bbadbba145a8a985f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:41:50 +00:00
Milton Wu
ed094b353b [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I911ef7db2860485823aa86c8c79e037b3db45389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 03:39:23 +00:00
TreeHugger Robot
eaabdee25c Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev 2022-09-28 03:05:56 +00:00
Arc Wang
9f04b02571 Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: Ib9b0b40a546d3eecb11535e28841a668e0fd3931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 02:59:15 +00:00
TreeHugger Robot
7b6a6847a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 995dbc4f45 -s ours am: 4833fc2cd7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68d15a6f9a2986f704330d6aa593b4230d343d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 02:45:38 +00:00
Bill Yi
3322347061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c920993671 -s ours am: 2ab2b35cbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78687c301fc99d332ba1a79e77ee6c1dd7197d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 02:45:21 +00:00
Chaohui Wang
787006017c Merge "Set showInstantApps = true for All App List" 2022-09-28 02:29:18 +00:00
Arc Wang
99cb9d91f1 Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: I2978b2a1b25c04d4cbac9022c3dc3ec651206bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 02:01:16 +00:00
TreeHugger Robot
4833fc2cd7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 995dbc4f45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib14252b3a16901a75b0b450e8da172b1a8dc09d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:42:43 +00:00
Bill Yi
2ab2b35cbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c920993671 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icdb0ece83ecade6e085421d09de8860e7f3e525b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:42:17 +00:00
Arc Wang
6626e50dd8 Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" 2022-09-28 01:22:51 +00:00
TreeHugger Robot
995dbc4f45 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-28 01:04:10 +00:00
TreeHugger Robot
21ae4c48d9 Merge "Allow updating app updater balance increments." 2022-09-27 23:56:15 +00:00
Bill Yi
a6aa169358 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours am: 14b86ebfce -s ours am: bdb3c55f7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I603b9d98c54f4a3fc2c8bbba3bd313ce433b0079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:44:34 +00:00
Bill Yi
a7041b22c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours am: b038fdb3b0 -s ours am: f22176a82d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0979d7391372c972cdd3065586677d14149b5af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:44:23 +00:00
Bill Yi
65624786d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours am: e744ffb618 -s ours am: 89136d4bdb -s ours
am skip reason: subject contains skip directive

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

Change-Id: If338637a2066446a73c731c5782a9166532a8e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:44:07 +00:00
Bill Yi
bdb3c55f7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours am: 14b86ebfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5e433cf9892156e4c19130e60310343ee43f80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:13:19 +00:00
Bill Yi
f22176a82d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours am: b038fdb3b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc8a6e7168b2753aa9f838e984b1cf29fdd0bea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:13:10 +00:00
Bill Yi
89136d4bdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours am: e744ffb618 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25558231205e038baee1005baaddffbed33251e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:12:52 +00:00
Bill Yi
69202cf960 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours am: e79f03ac12 -s ours am: 7ba3cd7e3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I413ca0fb97b2362dd56286569fb760dbf569a6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:07:32 +00:00
Bill Yi
aebce91a01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours am: d761c73acc -s ours am: 6aebd0ce26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3822e2f2e7deadc2218509dbb099a83d75238b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:07:21 +00:00
Bill Yi
6a96945fee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours am: 607d34f0ea -s ours am: 0c4ad6f1f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a6580a5285f94d1510356802a1a338db6cca012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 19:07:08 +00:00
Automerger Merge Worker
69f2a9c790 Merge changes from topic "am-483519735e0742ca8eac4d37fb5b6225"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours am: e910d1943b -s ours am: 96fc8ede52 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours am: 772476e65c -s ours am: 6c427100ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours am: 3bebde58b6 -s ours am: ea0084439d -s ours
2022-09-27 18:56:39 +00:00
Bill Yi
7ba3cd7e3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours am: e79f03ac12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I904fd061983fa03c751cbaa93da9940798c470fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:51:06 +00:00
Bill Yi
6aebd0ce26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours am: d761c73acc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87c85aa17db8f82e7959aa2006cc6aa0ce608d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:50:55 +00:00
Bill Yi
0c4ad6f1f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours am: 607d34f0ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I879f7100ec442d915a37d22287f7c2b074876bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:50:41 +00:00
Bill Yi
bfcfdfeaf3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours am: e910d1943b -s ours am: 96fc8ede52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb7e5a05855bdd4f06c53ac2159ec94daa244075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:49:53 +00:00
Bill Yi
18d1834f5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours am: 772476e65c -s ours am: 6c427100ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c6e996e9c7fbf1e8bf16ccbd6e259917695c387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:49:41 +00:00
Bill Yi
7627961c80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours am: 3bebde58b6 -s ours am: ea0084439d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibce5d4e5995ec11b7550377924f094bb7ee045c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:49:30 +00:00
Bill Yi
6d1e49d368 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 614c7886f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ce8ebf65c71401587972bf20d40f0781f583dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:46:38 +00:00
Bill Yi
ee31b70e63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: 9404d72552 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic69fe559458891e2fe34510991cda5e3cd4bf24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:46:30 +00:00
Bill Yi
8aef8af342 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 4cd061602c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2950c5066b8bf088a7361f1bb6c19b4f5fd8e035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:46:12 +00:00
Bill Yi
96fc8ede52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours am: e910d1943b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I930ba0a6c57e4619d205ee9a238059bfc4576f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:31:26 +00:00
Bill Yi
e79f03ac12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14053b570db226c0fa08fa56c76d8b3470aaa493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:31:15 +00:00
Bill Yi
14b86ebfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia006c877cbd06a9061467ea62905a537fea20535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:31:14 +00:00
Bill Yi
6c427100ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours am: 772476e65c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1a285afd827ed414ec46e8610e11c51e252ba2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:31:13 +00:00
Bill Yi
b038fdb3b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9fefe865a9e53a599089211f2471e84861a1d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:31:05 +00:00
Bill Yi
d761c73acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0b0636ca76fa53ce38ae420649762ae595a9817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:31:04 +00:00