Commit Graph

111250 Commits

Author SHA1 Message Date
TreeHugger Robot
2e9cf4f0c3 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 4f31518c41 am: 23d474a36f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I2641787a52c3c69fa5372ac964759230d532dcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:08:38 +00:00
TreeHugger Robot
20bbed4965 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3 am: 751fb13dea am: be7c57781a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: If155198e47c6414dfa299f6c1bd3a6fce69fe519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:08:15 +00:00
TreeHugger Robot
7bb7d91231 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 9d882fbb81 am: 4bdd4359dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I3530811bccb687910bb150b62098371ab3323239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:07:28 +00:00
TreeHugger Robot
23d474a36f Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 4f31518c41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I1aa20e2860d1c2cc0952c820516b649b74074315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:48:20 +00:00
TreeHugger Robot
be7c57781a Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3 am: 751fb13dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I0f8811fc7cba6bc0636ff01f6de83b30780d25ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:47:29 +00:00
TreeHugger Robot
4bdd4359dc Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 9d882fbb81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I0ac35362b2d5619ade43a004e948da8b84a0a957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:47:25 +00:00
TreeHugger Robot
ccfd91b243 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours am: 0602432a32 -s ours am: fb368c1ade -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6179136e55068b443e622e3739c84f2fc01c9211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:03:39 +00:00
Bill Yi
b87ed42698 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours am: b8112dac09 -s ours am: 9a9e114866 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id679191b945e6a4349ce9c1e011c387b17cd5987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:03:28 +00:00
Bill Yi
16c6874e3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours am: 30580dfed4 -s ours am: f2ee2e6a04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I411649a6af354535a30060ecd685731f8607d84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:03:08 +00:00
TreeHugger Robot
9d882fbb81 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Id5aca9149c81f6c29164f832e438c210494ee58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:58:44 +00:00
TreeHugger Robot
4f31518c41 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Iaf4096983d2b3cfb6e56cf336537be5b3f38fa1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:58:36 +00:00
TreeHugger Robot
751fb13dea Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Ie4a6f197d16da945da70d76f0612c59306f1ad5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:49:38 +00:00
Bill Yi
fccc92cfaa Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-13 18:45:27 +00:00
Bill Yi
806c6832ec Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-13 18:45:27 +00:00
Eric Biggers
59fcff0931 Merge "Use StorageManager.isFileEncrypted() instead of deprecated methods" 2022-06-13 18:41:26 +00:00
TreeHugger Robot
a0ebaf2b57 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I499228ea7bc6dd7971447040dac399dea5cb45d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:31:22 +00:00
TreeHugger Robot
fb368c1ade [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours am: 0602432a32 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f4676ac1399d9e0fe5f97df580482c2d243e52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:31:13 +00:00
Bill Yi
9a9e114866 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours am: b8112dac09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb52a99e6ffbeb42db04a645694e7a3ba65c7538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:30:57 +00:00
Bill Yi
f2ee2e6a04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours am: 30580dfed4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cae0dcca354acc7693326b31f05b28f0d5d73f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:30:43 +00:00
TreeHugger Robot
62a0ea69e3 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I5a82edaa021f62b910267ff6f7da5fda43453031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:29:37 +00:00
TreeHugger Robot
100e612f74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: d956cbe32a -s ours am: 0cd6c648b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4433251f0d633967af563e75feb6ce9db82c1a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:19:41 +00:00
Bill Yi
a1820bd061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours am: 947e4e0ce8 -s ours am: 10c38cbe0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26877fa30b462b5bd081b8db564d5f554e90e033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:19:29 +00:00
Bill Yi
ea61b501bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: 14f91f0604 -s ours am: bd9fab0861 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I469ea6f79119ce99af7b0dc2a0fcdf19a5e34a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:19:10 +00:00
Automerger Merge Worker
b844452ac7 Merge changes from topic "am-8706eed2db7742ddaa28a0099287ea89" into tm-qpr-dev-plus-aosp am: ba19ff3ead
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791

Change-Id: If0e96a951f018fe58b1fac19f07667008453ca4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:12:38 +00:00
TreeHugger Robot
0d53fd6d8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: 45f454ec8f -s ours am: 0eefdd24ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I445f0b29dc47dd9499a9a4aa9abda9e167d60b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:12:22 +00:00
TreeHugger Robot
e058aae3cd Merge "Add "smallestScreenSize" into homepage activities" into tm-dev 2022-06-13 18:11:22 +00:00
TreeHugger Robot
0602432a32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62f62d45d9c9b6a4fe74ec9c10060c16a0304984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:03:33 +00:00
Bill Yi
b8112dac09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie189203047c5d3106f06b155330a8ec3a6e2046f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:03:21 +00:00
Bill Yi
30580dfed4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26a6412f180f6ee94e1f48e3b79459bba6c91af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:03:01 +00:00
Bill Yi
216a316fe2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: c921642dde -s ours am: 972a4326da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c3513e9e02fcb1ed1e7e6afb3e3258266075b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:02:27 +00:00
Automerger Merge Worker
4d5f103d8f Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours" into tm-d1-dev-plus-aosp am: a20f785e3d -s ours am: 3227a73df6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c5449bc97d9e8036adbde36b05ce331182b69be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:00:05 +00:00
Bill Yi
8e2f2cb2b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours am: 798cf379cc -s ours am: db742301ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2645a4f82c7d43ce69ee6eae7e1ac6589c777b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:59:50 +00:00
Automerger Merge Worker
bd15d5ad57 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours" into tm-qpr-dev-plus-aosp am: 5a8d9eacb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I580199f9c93ae8d5345d0bf2e001309d69a6d29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:58:10 +00:00
Bill Yi
7015f35fef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours am: 022a077d4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5a7cd8074e5bf4a0ea97ed4c9946a2d2560bf10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:57:36 +00:00
Bill Yi
d65d507859 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: fbf554e66e -s ours am: 46f045f411 -s ours am: 8775a1bde6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4fd1d59f6970083d5df8bb7fc1557e9cbb28a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:53:06 +00:00
TreeHugger Robot
0cd6c648b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: d956cbe32a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc66aeac415edf1b8d19ba40d831d02196755552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:50:27 +00:00
Bill Yi
10c38cbe0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours am: 947e4e0ce8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1817974e381f1097f0a0846d21f798df59103e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:50:15 +00:00
Bill Yi
bd9fab0861 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: 14f91f0604 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8760a71f05782575d7dcc38148dc78246448dc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:49:55 +00:00
Automerger Merge Worker
ba19ff3ead Merge changes from topic "am-8706eed2db7742ddaa28a0099287ea89" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: 45f454ec8f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours am: 6693d73ef5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: b8aa62dbea -s ours
2022-06-13 17:48:03 +00:00
TreeHugger Robot
0eefdd24ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: 45f454ec8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17991c4a06519ccb0a19ff4de32873d5d21c25b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:46:58 +00:00
Bill Yi
af52e9c611 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours am: 6693d73ef5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I554b6364f4d253a62e6224a83342bcda7d2cc017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:46:42 +00:00
Bill Yi
972a4326da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: c921642dde -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia032ac2cc8405bc37b1e976b9da41369ce206f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:46:35 +00:00
Bill Yi
f0129ada03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: b8aa62dbea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff6952fcb7dab61d3eab327b3ac19ad8a305efc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:46:27 +00:00
Automerger Merge Worker
3227a73df6 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours" into tm-d1-dev-plus-aosp am: a20f785e3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id92b0d3ff35196b4c95d357387efe794ca1c52ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:45:03 +00:00
Bill Yi
db742301ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours am: 798cf379cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3dea9fd2d0d905f58f7f03837edfc8711848bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:44:30 +00:00
Automerger Merge Worker
5a8d9eacb1 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours" into tm-qpr-dev-plus-aosp 2022-06-13 17:43:32 +00:00
Bill Yi
8775a1bde6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: fbf554e66e -s ours am: 46f045f411 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e580674d228696aabcecd2bc2a5b75993ef80bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:42:20 +00:00
Bill Yi
022a077d4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13e1e8390eca6731f4f98cd9975b20ea8e74e465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:42:06 +00:00
TreeHugger Robot
3ecbe9bc0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib80b1d4f968a8275bc8c92aede6c84f8aa7ab523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:32:34 +00:00
Bill Yi
ae5b4b8105 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe20bf626167e701d69bb9b57eb6fa1a42fb1270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:32:19 +00:00