Commit Graph

698131 Commits

Author SHA1 Message Date
TreeHugger Robot
bfa223135c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ede5191d7b -s ours am: 601a976784 -s ours am: 8b174445a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f67ac5acb7dd69102a2f46d29725f2f1ab55c02
2021-07-05 03:35:38 +00:00
TreeHugger Robot
bc6676874f Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-05 03:28:55 +00:00
TreeHugger Robot
8b174445a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ede5191d7b -s ours am: 601a976784 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75d5356515fa6a3876b7edaaed8d2223d7849b68
2021-07-05 03:26:26 +00:00
TreeHugger Robot
e1ee2db354 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ede5191d7b -s ours am: e3e2fdc75c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e69365faefa4179c05d6c42299258de6410afb6
2021-07-05 03:25:58 +00:00
TreeHugger Robot
601a976784 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ede5191d7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5379da6b440197ab548f3756d710c0c6c54d25d
2021-07-05 03:12:23 +00:00
TreeHugger Robot
e3e2fdc75c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ede5191d7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4882eea1e1c5190987b3a2d6c2d2035b753c1ab1
2021-07-05 03:11:38 +00:00
TreeHugger Robot
ede5191d7b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-05 02:58:33 +00:00
TreeHugger Robot
c215f2ef89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 70acc12ee3 -s ours am: e2742a08a7 -s ours am: ee254e4f9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf52f751391f340522f8fb036d7c3730a5c3520f
2021-07-05 02:10:11 +00:00
TreeHugger Robot
6a0ccb3c20 [automerger skipped] Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb am: 3235aa7b56 -s ours am: 90f70a60c2 -s ours
am skip reason: Merged-In Ida2cd5975250604064b0baed00bc7c201ea97c5e with SHA-1 d926f329e1 is already in history

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

Change-Id: Ie549ac11e6f064d6e003bd9d9953f62e5947e8eb
2021-07-05 02:10:04 +00:00
TreeHugger Robot
06653e485d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 15c159fa47 -s ours am: 931c45410e -s ours am: ce64fa6585 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ib0a37aac124693db4f956bd3a763f6fd4d5d00c9
2021-07-05 02:09:11 +00:00
TreeHugger Robot
386231c0d2 [automerger skipped] Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb -s ours am: 39ba3ca743 -s ours am: 97294be44b -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: Id9d5643c1d251113ec1a4a19f2d99a4abada5f22
2021-07-05 02:08:53 +00:00
TreeHugger Robot
103c3e527e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 15c159fa47 -s ours am: abc0d1ce71 -s ours am: b359d93cff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I025867b38073a7040af8f40e83119e48b93984a4
2021-07-05 02:08:38 +00:00
Automerger Merge Worker
f3207310eb 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 am: 56089750f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38595b3cfd3a1f90bf5ecea52fa4472e4086e19e
2021-07-05 02:08:15 +00:00
TreeHugger Robot
60aa1e869c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d45e -s ours am: 05fa186dab -s ours am: 00743b16be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f3f57d776d4a6c2effad69e77577896f92c6d92
2021-07-05 02:06:04 +00:00
TreeHugger Robot
ee254e4f9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 70acc12ee3 -s ours am: e2742a08a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icac7450f633ca4901a7325a4541b0a8626e0967c
2021-07-05 01:54:02 +00:00
TreeHugger Robot
90f70a60c2 [automerger skipped] Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb am: 3235aa7b56 -s ours
am skip reason: Merged-In Ida2cd5975250604064b0baed00bc7c201ea97c5e with SHA-1 d926f329e1 is already in history

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

Change-Id: Iff67407072ff707c75419a025b06d494ce70589f
2021-07-05 01:53:49 +00:00
TreeHugger Robot
81299e0fdb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 70acc12ee3 -s ours am: 4f5a6d3a51 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I209437d1fe1f7e0bef26a82e0b6de10a1a4f54d2
2021-07-05 01:53:28 +00:00
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
f61234b602 [automerger skipped] Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb am: ed6bb7b97f -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: I7bc85817aeae373cb42f20944b8b375ec55b1796
2021-07-05 01:52:50 +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
TreeHugger Robot
568709f5ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 15c159fa47 -s ours am: c746cbda90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0bad322daac5859ad89c5e934fb0e623fd11f5b3
2021-07-05 01:52:03 +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
b1c49758e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d45e -s ours am: c96ea7894c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I976693c9fe384a722ba49371b7f37365952a387f
2021-07-05 01:51:14 +00:00
TreeHugger Robot
e2742a08a7 [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: Ia8321872ecf34f9f9939c3e5b7af26dbd421c5dd
2021-07-05 01:40:55 +00:00
TreeHugger Robot
3235aa7b56 Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191631

Change-Id: I7c7daeee0120ec92bf08a3c7d8e0ae2fc529ae7b
2021-07-05 01:40:43 +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
4f5a6d3a51 [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: I2ada1bd97035c4b2eae10fb9e6ed1a82fa4baa96
2021-07-05 01:40:22 +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
ed6bb7b97f Merge "Add VCN underlying networks" into sc-dev am: 053213b1cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191631

Change-Id: Ifa4bffa25648a666b874da92f86b8c5e0ad815d4
2021-07-05 01:39:45 +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
c746cbda90 [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: I4ad8baf23de66276ddb504fe79edd970e1da60b3
2021-07-05 01:38:54 +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
c96ea7894c [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: If3086931b1bc1cfc9072b80f4ed450a2b05411b8
2021-07-05 01:38:40 +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
Bill Yi
813589e90d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-05 00:29:31 +00:00
Bill Yi
d5e04df0d3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-05 00:29:24 +00:00
Automerger Merge Worker
6bd10151af 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: a0be3bce66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f2c41656e3bc60ecc5361f8864a05e20c83ea70
2021-07-04 20:56:32 +00:00
TreeHugger Robot
c47dbf6129 [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: e0a12523ae -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I3707c11745f27409bfec0042e297236f82b91397
2021-07-04 20:56:14 +00:00
TreeHugger Robot
0b2d293b4d [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: 16a306fc1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90f830a378c23fa08b999d52d7657026ade7a550
2021-07-04 20:56:06 +00:00