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

Commit 53c34ebd 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

Change-Id: Ibbb885ee643e909ff00cd302c62b112c645c68ca
parents fc7cbe46 9da82594

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...