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

Commit 1753b4e9 authored by leozwang's avatar leozwang
Browse files

resolved conflicts for 00fdede3 to lmp-mr1-ub-dev 

Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
parents fc168f84 00fdede3

tools/releasetools/ota_from_target_files

deleted120000 → 0
+1591 −1
Original line number Diff line number Diff line 
ota_from_target_files.py
 
 No newline at end of file

tools/releasetools/ota_from_target_files

0 → 100755
+1591 −1

File added.

Preview size limit exceeded, changes collapsed.

tools/releasetools/ota_from_target_files

120000 → 100755
+1591 −1

File changed.File mode changed from 120000 to 100755.

Contains only whitespace changes.