Commit Graph

650428 Commits

Author SHA1 Message Date
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
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
Treehugger Robot
d6a6e05b27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c26c8538c -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I2c1756ce7ae6dcce95510f8efe48a52a489da141
2021-07-04 16:23:52 +00:00
Treehugger Robot
412c317683 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:59:48 +00:00
Treehugger Robot
b41be71a7b Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:59:21 +00:00
Treehugger Robot
96ec301433 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:59:12 +00:00
Treehugger Robot
96d21505a9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:59:08 +00:00
Treehugger Robot
6aca88cb98 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:48 +00:00
Treehugger Robot
a2bedd52c3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:25 +00:00
Treehugger Robot
8a34ae7c17 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:16 +00:00
Treehugger Robot
2422df027f Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:57:15 +00:00
Treehugger Robot
048c86339c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:57:06 +00:00
Treehugger Robot
e97659d518 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:56:55 +00:00
Treehugger Robot
141285479c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:56:42 +00:00
Treehugger Robot
85ae6ad909 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:56:25 +00:00
Treehugger Robot
3c26c8538c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:55:26 +00:00
Treehugger Robot
a80977cd98 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:55:07 +00:00
TreeHugger Robot
7cd5446718 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b3034439ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74db1fba18af531df3864b60c8657ad05b63a091
2021-07-04 05:54:22 +00:00
TreeHugger Robot
ed653be38f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7674e12b36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f96340f8e75887d061d73d7fa65271f67d08af0
2021-07-04 05:54:04 +00:00
TreeHugger Robot
b3034439ee Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:35:11 +00:00
TreeHugger Robot
7674e12b36 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:34:54 +00:00
TreeHugger Robot
846828162d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ee040c5ff6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d4a3729628b576425daf25f7036f04f38b3b990
2021-07-04 04:57:08 +00:00
TreeHugger Robot
dc888dd6bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d89c0d5ded -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic14cc87b701516f08ad30b553322d1f20fb0b1dc
2021-07-04 04:56:53 +00:00
TreeHugger Robot
0c91d61562 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0d4acb77f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae0aed5447861edb3d3e48df6eab65c72b624eda
2021-07-04 04:56:37 +00:00
TreeHugger Robot
6d0fcbe90e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b0e22de395 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f49f8f86031bc84cbdb2e51dc9c2941abe82e5b
2021-07-04 04:55:52 +00:00