1. 6e2a8b1 resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp by Elliott Hughes · 9 years ago
  2. 2bf95ac Merge "Convert recovery to use BoringSSL instead of mincrypt." am: 62e6637 by Mattias Nissler · 9 years ago
  3. 62e6637 Merge "Convert recovery to use BoringSSL instead of mincrypt." by Elliott Hughes · 9 years ago
  4. 49ef134 resolve merge conflicts of a58a6db to nyc-dev-plus-aosp by Yabin Cui · 9 years ago
  5. a58a6db uncrypt: split libbootloader_message_writer for reuse. by Yabin Cui · 9 years ago
  6. 452df6d Convert recovery to use BoringSSL instead of mincrypt. by Mattias Nissler · 9 years ago
  7. fc60583 Merge "Import translations. DO NOT MERGE" into nyc-dev am: b162551 -s ours by Bill Yi · 9 years ago
  8. b162551 Merge "Import translations. DO NOT MERGE" into nyc-dev by Bill Yi · 9 years ago
  9. c1afe83 Import translations. DO NOT MERGE by Bill Yi · 9 years ago
  10. f726865 recovery-persist: pick up both pstore console files am: a569727 by Mark Salyzyn · 9 years ago
  11. a569727 recovery-persist: pick up both pstore console files by Mark Salyzyn · 9 years ago
  12. 59a55b5 Merge "recovery-persist: pick up both pstore console files" am: 901f315 by Mark Salyzyn · 9 years ago
  13. 4195388 Merge "recovery-persist: pick up both pstore console files" am: 901f315 by Mark Salyzyn · 9 years ago
  14. 901f315 Merge "recovery-persist: pick up both pstore console files" by Mark Salyzyn · 9 years ago
  15. ea22f8f Import translations. DO NOT MERGE am: f75b6e4 -s ours by Bill Yi · 9 years ago
  16. f75b6e4 Import translations. DO NOT MERGE by Bill Yi · 9 years ago
  17. 5f7111f recovery-persist: pick up both pstore console files by Mark Salyzyn · 9 years ago
  18. 5c23b80 Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161 by Elliott Hughes · 9 years ago
  19. dc91161 Merge "Move selinux dependencies out of header files." am: 8124750 by Elliott Hughes · 9 years ago
  20. 8124750 Merge "Move selinux dependencies out of header files." by Elliott Hughes · 9 years ago
  21. 4bbd5bf Move selinux dependencies out of header files. by Elliott Hughes · 9 years ago
  22. 658a467 recovery: use __android_log_pmsg_file_write for log files am: 13aca59 by Mark Salyzyn · 9 years ago
  23. 9b9e584 Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 by Mark Salyzyn · 9 years ago
  24. 6f83130 Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 by Mark Salyzyn · 9 years ago
  25. 13aca59 recovery: use __android_log_pmsg_file_write for log files by Mark Salyzyn · 9 years ago
  26. 75da771 Merge "recovery: use __android_log_pmsg_file_write for log files" by Mark Salyzyn · 9 years ago
  27. 6a54ca4 Import translations. DO NOT MERGE am: f1b2785 -s ours by Bill Yi · 9 years ago
  28. f1b2785 Import translations. DO NOT MERGE by Bill Yi · 9 years ago
  29. f41c35d Merge "uncrypt: remove --read-bcb option." am: ebd22be am: ecc068c -s ours by Yabin Cui · 9 years ago
  30. ecc068c Merge "uncrypt: remove --read-bcb option." am: ebd22be by Yabin Cui · 9 years ago
  31. ebd22be Merge "uncrypt: remove --read-bcb option." by Yabin Cui · 9 years ago
  32. 6507265 uncrypt: remove --read-bcb option. by Yabin Cui · 9 years ago
  33. 31d0872 Merge "uncrypt: fix call to close()." into nyc-dev am: 912e87e -s ours by Yabin Cui · 9 years ago
  34. 0d66126 Merge "Add string for Installing_security_update" am: 3568004 am: 2e21897 by Tianjie Xu · 9 years ago
  35. 2e21897 Merge "Add string for Installing_security_update" am: 3568004 by Tianjie Xu · 9 years ago
  36. 3568004 Merge "Add string for Installing_security_update" by Tianjie Xu · 9 years ago
  37. 0c39203 resolve merge conflicts of 61799ba to nyc-dev-plus-aosp by Yabin Cui · 9 years ago
  38. 912e87e Merge "uncrypt: fix call to close()." into nyc-dev by Yabin Cui · 9 years ago
  39. ffa3a1c uncrypt: fix call to close(). by Yabin Cui · 9 years ago
  40. 61799ba uncrypt: remove --read-bcb option. by Yabin Cui · 9 years ago
  41. 0f54a46 Add string for Installing_security_update am: 1ee0ff3 by Tianjie Xu · 9 years ago
  42. 1c95c97 Add string for Installing_security_update by Tianjie Xu · 9 years ago
  43. d6ac686 Fix uncrypt.cpp unique_fd build breakage. by Elliott Hughes · 9 years ago
  44. 20ab2db resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp by Elliott Hughes · 9 years ago
  45. 5cf4701 Merge "Switch to <android-base/unique_fd.h>." am: 5d73735 by Elliott Hughes · 9 years ago
  46. 5d73735 Merge "Switch to <android-base/unique_fd.h>." by Elliott Hughes · 9 years ago
  47. bcabd09 Switch to <android-base/unique_fd.h>. by Elliott Hughes · 9 years ago
  48. 1ee0ff3 Add string for Installing_security_update by Tianjie Xu · 9 years ago
  49. a4f701a recovery: use __android_log_pmsg_file_write for log files by Mark Salyzyn · 9 years ago
  50. e833769 Move recovery_l10n here from development/tools. am: cc79490 by Elliott Hughes · 9 years ago
  51. c15adeb Merge "Move recovery_l10n here from development/tools." am: 2dbd06c by Elliott Hughes · 9 years ago
  52. cc79490 Move recovery_l10n here from development/tools. by Elliott Hughes · 9 years ago
  53. 2dbd06c Merge "Move recovery_l10n here from development/tools." by Elliott Hughes · 9 years ago
  54. 3d0153a Move recovery_l10n here from development/tools. by Elliott Hughes · 9 years ago
  55. 05e76f7 Merge "Skip stashing source blocks in verify mode" am: 3123e5a by Tianjie Xu · 9 years ago
  56. 3123e5a Merge "Skip stashing source blocks in verify mode" by Tianjie Xu · 9 years ago
  57. 7eca97e Skip stashing source blocks in verify mode by Tianjie Xu · 9 years ago
  58. 180de7a Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2 by Tianjie Xu · 9 years ago
  59. 7e18ce2 Merge "Clean up intent_file related code in recovery.cpp" by Tianjie Xu · 9 years ago
  60. c52b853 Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a by Jed Estep · 9 years ago
  61. 9afbf2a Merge "Correct caching behavior for should_inject_cache" by Tao Bao · 9 years ago
  62. e326b22 Correct caching behavior for should_inject_cache by Jed Estep · 9 years ago
  63. c14d95d Clean up intent_file related code in recovery.cpp by Tianjie Xu · 9 years ago
  64. 7781778 Merge "Skip stashing source blocks in verify mode" into nyc-dev am: adca297 by Tianjie Xu · 9 years ago
  65. adca297 Merge "Skip stashing source blocks in verify mode" into nyc-dev by Tianjie Xu · 9 years ago
  66. 7a9da52 Correct caching behavior for should_inject_cache am: 88dd779 by Jed Estep · 9 years ago
  67. 0188935 Skip stashing source blocks in verify mode by Tianjie Xu · 9 years ago
  68. e969958 Merge "Remove dead tools." am: 4cb6812 by Elliott Hughes · 9 years ago
  69. 4cb6812 Merge "Remove dead tools." by Elliott Hughes · 9 years ago
  70. 57eb4fd Remove dead tools. by Elliott Hughes · 9 years ago
  71. 88dd779 Correct caching behavior for should_inject_cache by Jed Estep · 9 years ago
  72. 6f78768 Control fault injection with config files instead of build flags am: ff6df89 by Jed Estep · 9 years ago
  73. 9570508 Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60d by caozhiyuan · 9 years ago
  74. 867e60d Merge "Fix: full ota package larger than 2GB fails to upgrade" by Tao Bao · 9 years ago
  75. 2584f9c Fix: full ota package larger than 2GB fails to upgrade by caozhiyuan · 9 years ago
  76. ff6df89 Control fault injection with config files instead of build flags by Jed Estep · 9 years ago
  77. 1500f11 recovery: Move SwipeDetector into common location am: 9020e0f by Prashant Malani · 9 years ago
  78. 9020e0f recovery: Move SwipeDetector into common location by Prashant Malani · 9 years ago
  79. 6f44637 resolve merge conflicts of ce58688 to nyc-dev-plus-aosp by Tao Bao · 9 years ago
  80. ce58688 Revert "DO NOT MERGE Control fault injection with config files instead of build flags" by Tao Bao · 9 years ago
  81. d6e5862 resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp by Elliott Hughes · 9 years ago
  82. f73abf3 DO NOT MERGE Control fault injection with config files instead of build flags by Jed Estep · 9 years ago
  83. 1b688e8 Merge "Add include/ to the Makefile include path." am: 38234f4bef by Alex Deymo · 9 years ago
  84. 38234f4 Merge "Add include/ to the Makefile include path." by Alex Deymo · 9 years ago
  85. 82f8c82 Add include/ to the Makefile include path. by Alex Deymo · 9 years ago
  86. d2425ed resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp by Greg Kaiser · 9 years ago
  87. 0222db0 Merge "otafault: Fix setting of have_eio_error." into nyc-dev by Greg Kaiser · 9 years ago
  88. f4300bc otafault: Fix setting of have_eio_error. by Greg Kaiser · 9 years ago
  89. 3f581f7 Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev by Jed Estep · 9 years ago
  90. 761653a Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev by Jed Estep · 9 years ago
  91. b8a693b Port applypatch.sh tests to recovery_component_tests by Jed Estep · 9 years ago
  92. 8dcd014 Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev by Prashant Malani · 9 years ago
  93. 20df4ad Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev by Prashant Malani · 9 years ago
  94. a0b8dc7 applypatch: use vector to store data in FileContents. am: 1c522df25f -s ours by Yabin Cui · 9 years ago
  95. 7a49122 recovery: Remove SetColor, and other refactoring for WearUI by Prashant Malani · 9 years ago
  96. 1c522df applypatch: use vector to store data in FileContents. by Yabin Cui · 9 years ago
  97. 749054e recovery: Remove duplicate variables and functions am: 0ba21cff07 by Prashant Malani · 9 years ago
  98. 0ba21cf recovery: Remove duplicate variables and functions by Prashant Malani · 9 years ago
  99. 3f004e0 Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef -s ours by Tianjie Xu · 9 years ago
  100. d345de6 Merge "Reboot and retry on I/O errors" into nyc-dev by Tianjie Xu · 9 years ago