Commit Graph

657844 Commits

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

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

Change-Id: I560405d22997fc0ba7635851f67a3583eb23a158
2021-07-05 01:52:54 +00:00
TreeHugger Robot
655c132f8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 70acc12ee3 -s ours am: 9f2d0fa337 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e69022cd7160810b6de3793b7958f72b78c2eca
2021-07-05 01:52:31 +00:00
TreeHugger Robot
97294be44b [automerger skipped] Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb -s ours am: 39ba3ca743 -s ours
am skip reason: Merged-In Ida2cd5975250604064b0baed00bc7c201ea97c5e with SHA-1 1bfdfa2754 is already in history

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

Change-Id: I08b173b4afccd4a90bc03d2bf8e94b6842b31a6c
2021-07-05 01:52:27 +00:00
TreeHugger Robot
b359d93cff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 15c159fa47 -s ours am: abc0d1ce71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I228566b64187d4ad9a6ba9a7de48130bb86d9729
2021-07-05 01:52:14 +00:00
Automerger Merge Worker
56089750f6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d45e -s ours am: 5f9e5aa8d1 -s ours" into sc-v2-dev-plus-aosp 2021-07-05 01:51:54 +00:00
TreeHugger Robot
00743b16be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d45e -s ours am: 05fa186dab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id267dd9321517ba96c0b139b0a53529aa1e31845
2021-07-05 01:51:51 +00:00
TreeHugger Robot
be99ed51bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d45e -s ours am: 5f9e5aa8d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I974fcfbf4d2c71dd6b8abd890f2c2b53c9c99092
2021-07-05 01:51:46 +00:00
TreeHugger Robot
9f2d0fa337 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 70acc12ee3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70bdcac4f71a164976dcf5ac1e3f428298dae03e
2021-07-05 01:40:28 +00:00
TreeHugger Robot
931c45410e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 15c159fa47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib52d7091b61e5b9e562ff6467b14457b01ee3932
2021-07-05 01:40:02 +00:00
TreeHugger Robot
39ba3ca743 [automerger skipped] Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb -s ours
am skip reason: Merged-In Ida2cd5975250604064b0baed00bc7c201ea97c5e with SHA-1 1bfdfa2754 is already in history

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

Change-Id: I3a835543f27b811d16b58af089bf22d7ab8fc8d1
2021-07-05 01:40:02 +00:00
TreeHugger Robot
5f9e5aa8d1 [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: Icc73d2665201243782ef4a4d3c355b7b4688ed72
2021-07-05 01:39:36 +00:00
TreeHugger Robot
abc0d1ce71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 15c159fa47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b23abf0da19fa3a1a257a790b959d9d52d34a4b
2021-07-05 01:39:26 +00:00
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
70acc12ee3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-05 01:33:14 +00:00
TreeHugger Robot
053213b1cb Merge "Add VCN underlying networks" into sc-dev 2021-07-05 01:30:13 +00:00
TreeHugger Robot
15c159fa47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-05 01:25:04 +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
a0be3bce66 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc12 -s ours am: ec80d61144 -s ours" into sc-dev-plus-aosp am: b49d6b5e64 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I546e2111c29f50ed3ac5a9f5aa1f7461eaf1ff32
2021-07-04 20:55:32 +00:00
Bill Yi
7d04f59ffb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3fa915aa -s ours am: 350988e956 -s ours am: b5a3175d2b -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ia901aa2fd5b6c43bd072a4016300014a1be5fe48
2021-07-04 20:55:02 +00:00
Automerger Merge Worker
364e96141c Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4df82fd2c -s ours am: 372d28afb8 -s ours am: 3cab804129 -s ours" into sc-v2-dev-plus-aosp 2021-07-04 20:54:53 +00:00
Bill Yi
fd7529cb2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4df82fd2c -s ours am: 372d28afb8 -s ours am: 3cab804129 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ee2d58b48c95cee9df6465e625e0b58d4a07e22
2021-07-04 20:44:56 +00:00
TreeHugger Robot
aeb2261f92 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5d2afa5b1d -s ours am: d643fed6ed -s ours am: 5d745c2028 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59669e44b440429290fd6bed52a5e7d4967b2c8c
2021-07-04 20:09:03 +00:00
Bill Yi
e8ca3da344 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3fa915aa -s ours am: 350988e956 -s ours am: 2ac586c47d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43753114562f0d9b3f8889404d4a6719e1d3a327
2021-07-04 20:08:55 +00:00
TreeHugger Robot
3360c07d67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c1b17f6c9 -s ours am: 67933dbf84 -s ours am: 6a57c823b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99ac1482f1a865a66cff9f9b1eda55a22aa4dd80
2021-07-04 20:08:45 +00:00
Bill Yi
80ab14e1cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4df82fd2c -s ours am: 372d28afb8 -s ours am: 6d3f6a7b48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36d418d9c74e2168f05f50225b32afc312e06da9
2021-07-04 20:08:34 +00:00
TreeHugger Robot
5d745c2028 [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: I7d3d9df66f10571287ca4b9e37d2ef16b174d940
2021-07-04 19:27:53 +00:00
Bill Yi
2ac586c47d [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: Ia67ed0b015f964f89a1b7b89bcd055a25e0c0001
2021-07-04 19:27:48 +00:00
TreeHugger Robot
6a57c823b9 [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: I793a9e80522c03897251bb9771a9e94a3c499d5f
2021-07-04 19:27:39 +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
Bill Yi
6d3f6a7b48 [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: Ibce3c67f9554500dedae205320aa1372eb64cc7b
2021-07-04 19:27:31 +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
528918d077 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 528b60d731 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e7bb64abe6d0a1475ab330effb9e7f256a5e0e3
2021-07-04 19:08:41 +00:00
TreeHugger Robot
528b60d731 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-04 18:56:35 +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
f7680ef52d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8d1f8fdabb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb805249977823bf4386d8aca6e4637378d9173d
2021-07-04 18:44:29 +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
8d1f8fdabb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-04 18:33:15 +00:00
TreeHugger Robot
5b878834c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7ca8a506f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71ee858ce642ee0377d4eab3516b3ecaa52b2dc0
2021-07-04 18:27:35 +00:00
Bill Yi
045957fe5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a77753dcab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I870b39efae161c45b08981cbd00ffc0e60730d58
2021-07-04 18:27:14 +00:00
TreeHugger Robot
2c1b17f6c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-04 18:15:16 +00:00