Aleksandr Lukin
|
7888dfd518
|
Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347
Change-Id: I92f3ad3e76029f5f0f2caff4e5016a2475decaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-01 02:27:28 +00:00 |
|
Aleksandr Lukin
|
d1373d4a1a
|
Merge "Update the API usage to get total size of devices" into udc-d1-dev
|
2023-09-01 01:41:27 +00:00 |
|
Automerger Merge Worker
|
7ca1b2fec0
|
Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp
* changes:
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours
|
2023-08-31 21:33:31 +00:00 |
|
Automerger Merge Worker
|
3a3f389903
|
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I5e825c033beff24dfbc3f2927a0bbf51cc8e52bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:31:28 +00:00 |
|
Automerger Merge Worker
|
80cc76eda4
|
Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours am: 27207b8ba2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours am: 055f0b6e04 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours am: 108e964377 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours
|
2023-08-31 21:31:17 +00:00 |
|
Bill Yi
|
8dd6eb5801
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Iec7a0341be26f883a8abae2e8c3f44828ee08325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:31:14 +00:00 |
|
Bill Yi
|
a63c9b0a73
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours am: d1616c60a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: Ibfeadb7c29852872008f7954ee90ef2a34d84adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:28:47 +00:00 |
|
Bill Yi
|
0cc3b9a425
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours am: eaa92efd07 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: Ie22e8090f7e5ecc55918cfe95105620015f7eb0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:28:44 +00:00 |
|
Bill Yi
|
ef8d4e5e6b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d -s ours am: 14442ba7c3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I241174454651a7fb0cfabb36d392074c4ac2c5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:28:39 +00:00 |
|
Bill Yi
|
42d9975494
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593 -s ours am: 9725cfd44b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: Idf2cb2cbcafbdc6928a73e5ee9a9252f7afda607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:28:24 +00:00 |
|
Bill Yi
|
0b92155672
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d -s ours am: 34d81dca78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613427
Change-Id: If933aa7e7fbb1840af8ee02a78275e9592e5cc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:28:05 +00:00 |
|
Bill Yi
|
56d5a70aa0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I578e1d4fe45e60b2fde7b7e0d9af9dcf3e38ea27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:27:54 +00:00 |
|
Bill Yi
|
61a2ea9187
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours am: 27207b8ba2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I0cf5906c7ac346384d89e2d90d227db97c1fadd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:27:51 +00:00 |
|
Bill Yi
|
b36cbc1dbe
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours am: 055f0b6e04 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: Ifce7c8c228f698951d1c2f37bd734bbbdfb0caaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:27:45 +00:00 |
|
Bill Yi
|
a43ee44ceb
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours am: 108e964377 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I015b1ce40c29b6987f90f69b23a2839400351fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:27:37 +00:00 |
|
Bill Yi
|
042973ac81
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: Id211dfc9371b9ce70336cc4b504ccffc06f45e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 21:27:22 +00:00 |
|
Bill Yi
|
f3392e54a5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: If4c3101451c5aa3e06093944bc4ca66c85f7fad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:38:40 +00:00 |
|
Bill Yi
|
27207b8ba2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I0e6468a14a5b7ee3adbfea9c7991d7d9b66941c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:38:37 +00:00 |
|
Bill Yi
|
055f0b6e04
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I29f9ea6a663bdf41a1ad350c3a7c972cee9ef445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:38:32 +00:00 |
|
Bill Yi
|
108e964377
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I178d00e9b8ae40cdf5544cfc44bf8a49318435c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:38:23 +00:00 |
|
Bill Yi
|
9638eb7317
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I55cf63c9a4e5f691ed4a0ec52410e1d23e2d82c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:38:10 +00:00 |
|
Automerger Merge Worker
|
6f807ebf11
|
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours
|
2023-08-31 20:25:45 +00:00 |
|
Bill Yi
|
d1616c60a3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: I71574c31470b8f5312fe52e693b8934f521f5167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:23:16 +00:00 |
|
Bill Yi
|
eaa92efd07
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: I8c1d5fe34bfef41a0daa73f6e47309a6f5059b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:23:12 +00:00 |
|
Bill Yi
|
14442ba7c3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I44f10407d8a56ff717235e968662b746a0c0499d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:23:06 +00:00 |
|
Bill Yi
|
9725cfd44b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I8421ae19dab74712004d41c4c79820e2635ab625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:53 +00:00 |
|
Bill Yi
|
14b51e0e37
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Idd0d4bc53dbac3ec168c926670b5ffec6d40071c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:48 +00:00 |
|
Bill Yi
|
a00e01558c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I3e34dd6a79c327ba27c1384fecda62b6e54c212f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:44 +00:00 |
|
Bill Yi
|
9545ad3f39
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I9eb265c126c3476de84204c76888c21c25658566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:40 +00:00 |
|
Bill Yi
|
34d81dca78
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613427
Change-Id: I22e79e5b39cf9105f8143577980f9f2a4132fb3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:33 +00:00 |
|
Bill Yi
|
21c02da977
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I57fd58ff6a30701443b2930cc4db07e2d15cb6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:29 +00:00 |
|
Bill Yi
|
4a693729ce
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I43d21fba38300aa120186546740d2a54ca7f94ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 20:22:17 +00:00 |
|
Bill Yi
|
44ba06430a
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-08-31 19:08:21 +00:00 |
|
Bill Yi
|
21335a6957
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-08-31 19:08:21 +00:00 |
|
Bill Yi
|
5a3df756ce
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
|
2023-08-31 18:57:38 +00:00 |
|
Bill Yi
|
d3e67b615d
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
|
2023-08-31 18:57:38 +00:00 |
|
Treehugger Robot
|
e12be4e1ed
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: I7e4aeb2c45f138c3eae4271cb6bd15ff7ced10c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 17:24:52 +00:00 |
|
Bill Yi
|
d0e7c0c54d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: I5def24dee5cee90afa719de1c57afe39849b0890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 17:24:44 +00:00 |
|
Bill Yi
|
93b69ed9ba
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613397
Change-Id: I0505abbd40d2a1ebfe71b915a179624e2567f9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-31 17:24:24 +00:00 |
|
Treehugger Robot
|
ba09c7a937
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-08-31 16:41:24 +00:00 |
|
Bill Yi
|
1a6ff240a4
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibb11b23d4cca99e73666fdb7bb806440e8ab7489
|
2023-08-30 20:14:48 -07:00 |
|
Bill Yi
|
b0a6787bd1
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I953afa5170d8d3441c23313685a1f718428865ff
|
2023-08-30 20:14:00 -07:00 |
|
Bill Yi
|
c41647a3bc
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I47594fe5874b47c442583cad4d58e2aa3dfca65b
|
2023-08-30 20:09:47 -07:00 |
|
Bill Yi
|
ecd0754441
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic37c0b286960257934e49704d83ff6e23fa7653f
|
2023-08-30 20:08:16 -07:00 |
|
Bill Yi
|
4fb8f731c8
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I90575a0789147f048e62e5444bb9e38cbb95f003
|
2023-08-30 20:05:24 -07:00 |
|
Bill Yi
|
cb9037e6fe
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6b427814df97ec7a9f3d1294408595c511b71e0f
|
2023-08-30 19:42:30 -07:00 |
|
Bill Yi
|
2a5e445593
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2f272e914c7b2f0f5e428ceed87c3d66cf4e8fca
|
2023-08-30 19:40:08 -07:00 |
|
Bill Yi
|
8f8a434c4d
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1df59a39a32f1509838c51a08fd62430231e1f01
|
2023-08-30 19:38:08 -07:00 |
|
Ram Peri
|
acbb1b5560
|
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9 am: eb446ca146
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384
Change-Id: I0b5d81f67979bcb0fc5377e620d8be96059151a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-30 16:51:10 +00:00 |
|
Ram Peri
|
eb446ca146
|
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384
Change-Id: I8a7e3f2a148ec25b5f0b358d5c609e0f551ed5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-30 16:03:43 +00:00 |
|