Commit Graph

650466 Commits

Author SHA1 Message Date
TreeHugger Robot
05fa186dab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d45e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201279

Change-Id: I20a3c226365bd302f01c6d44438e01a0917f9e21
2021-07-05 01:38:51 +00:00
TreeHugger Robot
c125d9d45e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-05 01:24:53 +00:00
Automerger Merge Worker
b49d6b5e64 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc12 -s ours am: ec80d61144 -s ours" into sc-dev-plus-aosp 2021-07-04 19:27:32 +00:00
Treehugger Robot
3d4763ba0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc12 -s ours am: ec80d61144 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755813

Change-Id: Idd7b9769f6a9f8139dfd05fa752728e336b4e8d1
2021-07-04 19:27:22 +00:00
TreeHugger Robot
50c1bb1464 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5d2afa5b1d -s ours am: d643fed6ed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179771

Change-Id: I7bd458fc636874da406798e679ed87011f5dcd2c
2021-07-04 19:27:16 +00:00
Bill Yi
b5a3175d2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3fa915aa -s ours am: 350988e956 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201275

Change-Id: I5807429eb38f7b1d79d2fcf431d67c1e05988c99
2021-07-04 19:27:09 +00:00
TreeHugger Robot
12a15eee7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c1b17f6c9 -s ours am: 67933dbf84 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201714

Change-Id: If30db198afdaa99f61b2b02cc9bc4f3a56cdf8cc
2021-07-04 19:27:01 +00:00
Bill Yi
3cab804129 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4df82fd2c -s ours am: 372d28afb8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201277

Change-Id: Ib7a93569f87f4aa04661c7ac3a04fccdcc19ace5
2021-07-04 19:26:40 +00:00
TreeHugger Robot
d643fed6ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5d2afa5b1d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179771

Change-Id: Ie7613c7f1fb15a8944b43be2b974a0bf2e20e02a
2021-07-04 18:46:04 +00:00
Bill Yi
350988e956 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3fa915aa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201275

Change-Id: Ifed1bf525d360bbb9460926e8b631da83a5744ff
2021-07-04 18:45:07 +00:00
Treehugger Robot
ec80d61144 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc12 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755813

Change-Id: I90ee68a38116be8db014897887e12b61ef8170d8
2021-07-04 18:44:54 +00:00
TreeHugger Robot
67933dbf84 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c1b17f6c9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201714

Change-Id: I4828750af1d553764c28533ecacfbf6a5b40992b
2021-07-04 18:44:15 +00:00
Bill Yi
372d28afb8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4df82fd2c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15201277

Change-Id: I731ee1c5d50413cb6c3ef2e19b2e9d872c5eb52f
2021-07-04 18:44:03 +00:00
TreeHugger Robot
5d2afa5b1d Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-04 18:40:45 +00:00
TreeHugger Robot
2c1b17f6c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-04 18:15:16 +00:00
Treehugger Robot
979367bc12 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 17:58:58 +00:00
Treehugger Robot
0f12baf766 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0c9ca6cc8e -s ours am: a3cf33e5ba -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753903

Change-Id: I11f72ed70560f60e3d80e7907844923f7274359b
2021-07-04 17:20:45 +00:00
Treehugger Robot
ac196b1023 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59f64e1e92 -s ours am: 79ebe8fe09 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755759

Change-Id: Ieb35387ac514ee7e301f422557f9de6cf53a165c
2021-07-04 17:20:33 +00:00
Treehugger Robot
4fdc70c7e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 94dd86b111 -s ours am: c0a8f72ee3 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753902

Change-Id: I4de87a382afd732381641c0a03eb93b73493c5d0
2021-07-04 17:20:20 +00:00
Treehugger Robot
317283007a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 484eb23a34 -s ours am: bbbc466843 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755768

Change-Id: I06f8f61e2ee9ef00845535cfa6cf216dddb6a580
2021-07-04 17:20:03 +00:00
Treehugger Robot
fba588f2e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 412c317683 -s ours am: 6946d7a0fa -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755815

Change-Id: I41c7cea3121110dcf7324e6319689dd513eb80eb
2021-07-04 17:19:49 +00:00
Treehugger Robot
ebee7ed426 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b41be71a7b -s ours am: 4e7fa34863 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755809

Change-Id: Iacacaa16eb95dd69d0c4b42186a247878cbb46d3
2021-07-04 17:19:33 +00:00
Treehugger Robot
572c10fee2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96ec301433 -s ours am: 18cb065f14 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755812

Change-Id: Ia457cc698fd4b23b578feca361690974b06bffbd
2021-07-04 17:19:18 +00:00
Treehugger Robot
d753d14882 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96d21505a9 -s ours am: 155d1092c8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755818

Change-Id: Ifa4805176183b07d762ec931824538c52d02efd3
2021-07-04 17:19:04 +00:00
Treehugger Robot
5c7f3e29bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6aca88cb98 -s ours am: aa9494a0f7 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755811

Change-Id: Idfe9f9f9461c9800f9a1a330696f6ec2c767318e
2021-07-04 17:18:48 +00:00
Treehugger Robot
8d799fcad7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2bedd52c3 -s ours am: b12b2b528c -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755766

Change-Id: If9f9f7d8e81dd42a0dc38c059552c874c0238671
2021-07-04 17:18:33 +00:00
Treehugger Robot
7b201c96b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8a34ae7c17 -s ours am: 96f76d2cda -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755816

Change-Id: I55cbfd01404dc8c5671165248b8e9e0256e21b8f
2021-07-04 17:18:17 +00:00
Treehugger Robot
8620a0926a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2422df027f -s ours am: 6fd3242312 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755814

Change-Id: Ic10d7d6001284405ca2e7e7bc8c99ecad2a37e32
2021-07-04 17:18:01 +00:00
Treehugger Robot
bc76ba7f30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 048c86339c -s ours am: 33a27bf09a -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755810

Change-Id: Ieb13d7a7f162372347ce8f7f4ea4ac1587539dbb
2021-07-04 17:17:45 +00:00
Treehugger Robot
3e1c9a4a89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e97659d518 -s ours am: 4839681223 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755817

Change-Id: I2e07fec7264bcbe23a0ce01d8496f6c2a8615b0f
2021-07-04 17:17:31 +00:00
Treehugger Robot
86ab8450ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 141285479c -s ours am: 6ed5f5c622 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755758

Change-Id: Idc7e71b68193ef8ac8b6d668d5150257b2c5fe87
2021-07-04 17:17:16 +00:00
Treehugger Robot
e3c3344b05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 85ae6ad909 -s ours am: ec320d1496 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755767

Change-Id: I7c32a2cc6b89f91ae0ab3a4cfa867adb421888d3
2021-07-04 17:17:01 +00:00
Treehugger Robot
07c54d9bbb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c26c8538c -s ours am: d6a6e05b27 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755757

Change-Id: Ie055cd4064369825ff4108f21b7f8129fda32b99
2021-07-04 17:16:43 +00:00
Treehugger Robot
c90752b98b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a80977cd98 -s ours am: f7045c7806 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755756

Change-Id: Iba321afdd2558e584710fe279d1de93bad883d19
2021-07-04 17:15:50 +00:00
Treehugger Robot
a3cf33e5ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0c9ca6cc8e -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753903

Change-Id: Ia18dc24d4a0e43448d5e88e65bc91f7be88309e1
2021-07-04 16:34:48 +00:00
Treehugger Robot
79ebe8fe09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59f64e1e92 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755759

Change-Id: I1369fd3a072fe7421b76382dfa1c928c6a6b93fa
2021-07-04 16:34:20 +00:00
Treehugger Robot
c0a8f72ee3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 94dd86b111 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753902

Change-Id: I87e7440ed909e3d1990c67b849c760c97ebea805
2021-07-04 16:33:45 +00:00
Treehugger Robot
bbbc466843 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 484eb23a34 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755768

Change-Id: I8801bc61a470cb900cee0eafa7d5c66efa7e5737
2021-07-04 16:27:22 +00:00
Treehugger Robot
6946d7a0fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 412c317683 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755815

Change-Id: I4e8489c0cbf0d441bc9733a3b7901b18a35f2109
2021-07-04 16:27:15 +00:00
Treehugger Robot
4e7fa34863 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b41be71a7b -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755809

Change-Id: Idda221c3930b8a5c3c60c085b6496b5e97a6a79b
2021-07-04 16:27:04 +00:00
Treehugger Robot
18cb065f14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96ec301433 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755812

Change-Id: Ice76f3156551cc1a54d423758449bd89c9791c0b
2021-07-04 16:26:57 +00:00
Treehugger Robot
155d1092c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96d21505a9 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755818

Change-Id: Ib89b3c2f8a1371d7f7ccae2b3a20b3d5ce3677d8
2021-07-04 16:26:52 +00:00
Treehugger Robot
aa9494a0f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6aca88cb98 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755811

Change-Id: I9786217775bd777e14dbad3f806587022661f7bf
2021-07-04 16:26:43 +00:00
Treehugger Robot
b12b2b528c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2bedd52c3 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755766

Change-Id: I04b40705e1b3397867d5af6ca20cf47ce72f77b9
2021-07-04 16:26:39 +00:00
Treehugger Robot
96f76d2cda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8a34ae7c17 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755816

Change-Id: I24560da97204e2aa87bfbe8d1a6ac3ee7716f405
2021-07-04 16:26:31 +00:00
Treehugger Robot
6fd3242312 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2422df027f -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755814

Change-Id: I634d7fb6c8bca729f25c61139f726e5c1deb41cf
2021-07-04 16:26:22 +00:00
Treehugger Robot
33a27bf09a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 048c86339c -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755810

Change-Id: Iafe6467adf2f0e4fbda01f8feb57296769d71899
2021-07-04 16:26:10 +00:00
Treehugger Robot
4839681223 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e97659d518 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755817

Change-Id: If8d048b5ab8987725ca4d352e8987a1c0c8d6bb6
2021-07-04 16:25:54 +00:00
Treehugger Robot
6ed5f5c622 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 141285479c -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755758

Change-Id: Iee4df2ca724fa109827779e82c46b315261eaecb
2021-07-04 16:25:40 +00:00
Treehugger Robot
ec320d1496 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 85ae6ad909 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755767

Change-Id: I359699c38899389b27099e959a880902cef19fe0
2021-07-04 16:25:27 +00:00