Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / 8a45a1883cb0eba7278b3cb5589c4e43797511f2
commit8a45a1883cb0eba7278b3cb5589c4e43797511f2[log] [tgz]
authorbigbiff <bigbiff@teamw.in>Mon May 18 15:46:39 2020 -0400
committerbigbiff <bigbiff@teamw.in>Mon May 18 15:46:39 2020 -0400
tree50353aa889538b08bc357c3b59c2c1be6d6f6b76
parent72bcc2030c04af4df4f1eea47359ee96ad3aa651 [diff]
merge conflict: remove merge conflict message

Change-Id: Ife2ff7082494f9cc933a9f22e596ca0716c2ced6
1 file changed
tree: 50353aa889538b08bc357c3b59c2c1be6d6f6b76
  1. .github/
  2. adbbu/
  3. applypatch/
  4. attr/
  5. bmlutils/
  6. boot_control/
  7. bootloader_message/
  8. bootloader_message_twrp/
  9. crypto/
  10. dosfstools/
  11. edify/
  12. etc/
  13. exfat/
  14. fastboot/
  15. fb2png/
  16. flashutils/
  17. fonts/
  18. fuse/
  19. fuse_sideload/
  20. fuse_sideload28/
  21. gpt/
  22. gui/
  23. htcdumlock/
  24. injecttwrp/
  25. install/
  26. install28/
  27. libblkid/
  28. libcrecovery/
  29. libmincrypt/
  30. libpixelflinger/
  31. libtar/
  32. minadbd/
  33. minadbd21/
  34. minui/
  35. minui21/
  36. minuitwrp/
  37. minzip/
  38. misc_writer/
  39. mmcutils/
  40. mtdutils/
  41. mtp/
  42. openaes/
  43. orscmd/
  44. otafault/
  45. otautil/
  46. pigz/
  47. prebuilt/
  48. recovery_ui/
  49. res/
  50. res-hdpi/
  51. res-mdpi/
  52. res-xhdpi/
  53. res-xxhdpi/
  54. res-xxxhdpi/
  55. scripts/
  56. sepolicy/
  57. simg2img/
  58. tests/
  59. tools/
  60. twrpDigest/
  61. twrpTarMain/
  62. uncrypt/
  63. update_verifier/
  64. updater/
  65. updater_sample/
  66. verifier24/
  67. verifier28/
  68. .clang-format
  69. .gitignore
  70. Android.bp
  71. Android.mk
  72. BasePartition.cpp
  73. bootloader.h
  74. CleanSpec.mk
  75. common.h
  76. data.cpp
  77. data.hpp
  78. exclude.cpp
  79. exclude.hpp
  80. find_file.cpp
  81. find_file.hpp
  82. fixContexts.cpp
  83. fixContexts.hpp
  84. fsck_unshare_blocks.cpp
  85. fsck_unshare_blocks.h
  86. fuse.h
  87. fuse_sideload22.cpp
  88. fuse_sideload22.h
  89. infomanager.cpp
  90. infomanager.hpp
  91. installcommand.cpp
  92. interlace-frames.py
  93. legacy_properties.h
  94. mounts.c
  95. NOTICE
  96. openrecoveryscript.cpp
  97. openrecoveryscript.hpp
  98. OWNERS
  99. partition.cpp
  100. partitionmanager.cpp
  101. partitions.hpp
  102. PREUPLOAD.cfg
  103. progresstracking.cpp
  104. progresstracking.hpp
  105. README.md
  106. recovery-persist.cpp
  107. recovery-persist.rc
  108. recovery-refresh.cpp
  109. recovery-refresh.rc
  110. recovery.cpp
  111. recovery.h
  112. recovery_main.cpp
  113. recovery_ui.h
  114. tarWrite.c
  115. tarWrite.h
  116. twcommon.h
  117. twinstall.cpp
  118. twinstall.h
  119. twinstallorig.cpp
  120. twinstallorig.h
  121. twrp-functions.cpp
  122. twrp-functions.hpp
  123. twrp.cpp
  124. twrpAdbBuFifo.cpp
  125. twrpAdbBuFifo.hpp
  126. twrpDigestDriver.cpp
  127. twrpDigestDriver.hpp
  128. twrpTar.cpp
  129. twrpTar.h
  130. twrpTar.hpp
  131. variables.h