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

Unverified Commit 82e3efd1 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r18' into staging/lineage-19.0_merge-android-12.0.0_r18

Android 12.0.0 release 18

* tag 'android-12.0.0_r18' of https://android.googlesource.com/platform/bootable/recovery:
  Do not write past end of inotify event structure.
  Do not write past end of inotify event structure.
  Do not write past end of inotify event structure.
  Do not write past end of inotify event structure.
  Import translations. DO NOT MERGE ANYWHERE

 Conflicts:
	minui/events.cpp

Change-Id: I3499e09df746435d594a524569d1de7f84873814
parents 052c6ff2 018409c5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment