Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6eca86 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-3a9402156785479eb4f39b60c87bc31d" into udc-d1-dev-plus-aosp 

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dc0e83ef -s ours am: 8a4472e6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: baa0e94e -s ours am: 5cc0d15e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cd6a44ec -s ours am: 0bbe542b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44c2d6f7 -s ours am: 17745f22 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 19be9460 -s ours am: 0795ea2d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 350b7636 -s ours am: 2bbdee55 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2c5f4414 -s ours am: 3f26f650 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b78f665c -s ours am: 104c3dd9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a736a562 -s ours am: 0942465e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b95e0349 -s ours am: 61d1e2bd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 128170bc -s ours am: c2136f39 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84ca2f0 -s ours am: 51bc1bf8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 794d30f7 -s ours am: 2e9fd5bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9290c622 -s ours am: 9a0074dd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1cfabdbb -s ours am: 905c61c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3be20cf -s ours am: a28effc4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c8432ce7 -s ours am: e2ee1958 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5de78462 -s ours am: 9fb37315 -s ours
parents 315c34f2 b8cd25e5

There are no changes