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

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

Merge changes from topic "am-f5adbe04185a47d497d62dc19554787a" 

* changes:
  [automerger skipped] Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" into udc-dev am: 91a777b5 -s ours am: 46db7b0c -s ours am: 9fd53ee0 -s ours am: 26800708 -s ours
  [automerger skipped] Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT am: b419fa0b -s ours am: 7ef6ff72 -s ours am: c96af6c6 -s ours am: 2cefac2f -s ours
parents c7c6ee5d 08cd86e0

There are no changes