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

Commit bffbd487 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Resolve merge conflicts of 286848e7 to stage-aosp-master am: 9da82594 am: 53c34ebd 

am: 03539f5e

Change-Id: Iea45e9db6cc0719643f9804535916d283843e719
parents acc7ebb9 03539f5e

res-hdpi/images/erasing_text.png

+684 B (54.6 KiB)
Loading image diff...

res-hdpi/images/error_text.png

+444 B (38.6 KiB)
Loading image diff...

res-hdpi/images/installing_security_text.png

−455 B (119 KiB)
Loading image diff...

res-hdpi/images/installing_text.png

−1.05 KiB (109 KiB)
Loading image diff...

res-hdpi/images/no_command_text.png

+672 B (66.5 KiB)
Loading image diff...