1. cfda5bb resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp by Daniel Rosenberg · 9 years ago
  2. 559349e am c2da0bd0: am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-dev by Jim Miller · 9 years ago
  3. 7d6ca31 am 00392411: am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc" by Daniel Rosenberg · 9 years ago
  4. 26a81c1 am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk" by Daniel Rosenberg · 9 years ago
  5. 074ee01 am a0ced754: Merge "Remove creation of root directory folders" by Daniel Rosenberg · 9 years ago
  6. 0039241 am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc" by Daniel Rosenberg · 9 years ago
  7. f3cd170 am 3470855e: Merge "rootdir: Create folders in Android.mk" by Daniel Rosenberg · 9 years ago
  8. a0ced75 Merge "Remove creation of root directory folders" by Daniel Rosenberg · 9 years ago
  9. e7ed68a Merge "libcutils: fs_config: Add folders normally created in init.rc" by Daniel Rosenberg · 9 years ago
  10. 3470855 Merge "rootdir: Create folders in Android.mk" by Daniel Rosenberg · 9 years ago
  11. b7f1f61 am ee923139: Merge "Set up user directory crypto in init." into mnc-dr-dev by Paul Crowley · 9 years ago
  12. c2da0bd am 1ee9d9a8: Merge "Fingerprint: Add HAL close() code" into mnc-dev by Jim Miller · 9 years ago
  13. ee92313 Merge "Set up user directory crypto in init." into mnc-dr-dev by Paul Crowley · 9 years ago
  14. c1fa34b am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev by Paul Lawrence · 9 years ago
  15. d5ef984 Merge "Change init sequence to support file level encryption" into mnc-dr-dev by Paul Lawrence · 9 years ago
  16. 8ee286c am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache" by Calin Juravle · 9 years ago
  17. ed5c99e am 09a0b17d: Merge "Allow native bridge to work without a code cache" by Calin Juravle · 9 years ago
  18. 09a0b17 Merge "Allow native bridge to work without a code cache" by Calin Juravle · 9 years ago
  19. 58cfceb am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible." by Tao Bao · 9 years ago
  20. 75b3f8c am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible." by Tao Bao · 9 years ago
  21. 8710125 Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible." by Tao Bao · 9 years ago
  22. a29c012 libsparse: Wrap sparse_crc32.h to be C++ compatible. by Tao Bao · 9 years ago
  23. 1ee9d9a Merge "Fingerprint: Add HAL close() code" into mnc-dev by Jim Miller · 9 years ago
  24. dae4837 Fingerprint: Add HAL close() code by Sasha Levitskiy · 9 years ago
  25. 9faa258 am 2407ec38: am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev by Thierry Strudel · 9 years ago
  26. 2407ec3 am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev by Thierry Strudel · 9 years ago
  27. 8703bea Merge "fs_config: replace getenv('OUT') by new fs_config parameter" into mnc-dev by Thierry Strudel · 9 years ago
  28. 07f0aef am a5c8358a: am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev by Andres Morales · 9 years ago
  29. beb4fa6 am b8fb72e0: am 0b0435ea: [gatekeeperd] fix file descriptor leak by Andres Morales · 9 years ago
  30. a5c8358 am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev by Andres Morales · 9 years ago
  31. 787c376 Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev by Andres Morales · 9 years ago
  32. b8fb72e am 0b0435ea: [gatekeeperd] fix file descriptor leak by Andres Morales · 9 years ago
  33. 0b0435e [gatekeeperd] fix file descriptor leak by Andres Morales · 9 years ago
  34. df33ffa fs_config: replace getenv('OUT') by new fs_config parameter by Thierry Strudel · 9 years ago
  35. cef898f Allow native bridge to work without a code cache by jgu21 · 9 years ago
  36. e7203ee am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable." by Christopher Ferris · 9 years ago
  37. c03e40f am a3ee46f1: Merge "Dump memory going from unreadable to readable." by Christopher Ferris · 9 years ago
  38. a3ee46f Merge "Dump memory going from unreadable to readable." by Christopher Ferris · 9 years ago
  39. f6b2a7f am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]" by Pirama Arumuga Nainar · 9 years ago
  40. 8507453 am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]" by Pirama Arumuga Nainar · 9 years ago
  41. 8cd6280 Merge "Use delete[] to de-allocate pointers from new[]" by Pirama Arumuga Nainar · 9 years ago
  42. 456abba Dump memory going from unreadable to readable. by Christopher Ferris · 9 years ago
  43. 01c48dc am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral."" by Dan Albert · 9 years ago
  44. 00599ec am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral."" by Dan Albert · 9 years ago
  45. e84205b Merge "Revert "Turn on -Wformat-nonliteral."" by Dan Albert · 9 years ago
  46. 286bb6d Revert "Turn on -Wformat-nonliteral." by Dan Albert · 9 years ago
  47. 1ce139b am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral." by Dan Albert · 9 years ago
  48. fcdc314 am a35affb5: Merge "Turn on -Wformat-nonliteral." by Dan Albert · 9 years ago
  49. a35affb Merge "Turn on -Wformat-nonliteral." by Dan Albert · 9 years ago
  50. 33cd731 am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." by Elliott Hughes · 9 years ago
  51. 837eff2 Use delete[] to de-allocate pointers from new[] by Pirama Arumuga Nainar · 9 years ago
  52. 459df8f Turn on -Wformat-nonliteral. by Dan Albert · 9 years ago
  53. 9d748c8 am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." by Elliott Hughes · 9 years ago
  54. a6241a0 Merge "Replace HAVE_WIN32_IPC with _WIN32." by Elliott Hughes · 9 years ago
  55. 095307e Replace HAVE_WIN32_IPC with _WIN32. by Elliott Hughes · 9 years ago
  56. 64dffd3 Remove creation of root directory folders by Daniel Rosenberg · 9 years ago
  57. bbe796d libcutils: fs_config: Add folders normally created in init.rc by Daniel Rosenberg · 9 years ago
  58. 58458b6 rootdir: Create folders in Android.mk by Daniel Rosenberg · 9 years ago
  59. 6093754 am 0473a1ea: am b6deb331: Merge "New property that determines when to wait for gdb." by Christopher Ferris · 9 years ago
  60. 0473a1e am b6deb331: Merge "New property that determines when to wait for gdb." by Christopher Ferris · 9 years ago
  61. b6deb33 Merge "New property that determines when to wait for gdb." by Christopher Ferris · 9 years ago
  62. d79f2be New property that determines when to wait for gdb. by Christopher Ferris · 9 years ago
  63. 801ee19 am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img" by Daniel Rosenberg · 9 years ago
  64. fef908e [gatekeeperd] fix use of uninitialized memory by Andres Morales · 9 years ago
  65. 32933ff am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img" by Daniel Rosenberg · 9 years ago
  66. dc4fa7f Merge "Fix "adb remount" for when the root directory is in system.img" by Daniel Rosenberg · 9 years ago
  67. 78ec30d am 708e5438: am 41a0654e: Merge "Replace all _LOG error calls with ALOGE." by Christopher Ferris · 9 years ago
  68. d6eba89 Fix "adb remount" for when the root directory is in system.img by Daniel Rosenberg · 9 years ago
  69. 708e543 am 41a0654e: Merge "Replace all _LOG error calls with ALOGE." by Christopher Ferris · 9 years ago
  70. 41a0654 Merge "Replace all _LOG error calls with ALOGE." by Christopher Ferris · 9 years ago
  71. 7a6e04f am eb528dd5: Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev by Sami Tolvanen · 9 years ago
  72. eb528dd Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev by Sami Tolvanen · 9 years ago
  73. 3fd58ae fs_mgr: Use ro.boot.veritymode by Sami Tolvanen · 9 years ago
  74. d8af16b am dba00aab: am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions." by Elliott Hughes · 9 years ago
  75. dba00aa am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions." by Elliott Hughes · 9 years ago
  76. c9aeae2 Merge "Fix debuggerd's gdbclient instructions." by Elliott Hughes · 9 years ago
  77. 39a28c2 Fix debuggerd's gdbclient instructions. by Elliott Hughes · 9 years ago
  78. 948410a Change init sequence to support file level encryption by Paul Lawrence · 9 years ago
  79. e8308f8 am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev by Paul Lawrence · 9 years ago
  80. 8104616 Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev by Paul Lawrence · 9 years ago
  81. 437bc5d Revert "Change init sequence to support file level encryption" by Paul Lawrence · 9 years ago
  82. 722d4a5 am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev by Andres Morales · 9 years ago
  83. 833f142 Merge "[init] start gatekeeperd after device decryption" into mnc-dev by Andres Morales · 9 years ago
  84. 609c7ac am 6b6c1bd9: Gracefully handle ENODEV in sdcard daemon (part deux) by Mark Salyzyn · 9 years ago
  85. 6b6c1bd Gracefully handle ENODEV in sdcard daemon (part deux) by Mark Salyzyn · 9 years ago
  86. 22d0ee6 am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev by Paul Lawrence · 9 years ago
  87. a65e402 Merge "Change init sequence to support file level encryption" into mnc-dev by Paul Lawrence · 9 years ago
  88. 341b607 am 25aabb9e: Permission to view shared storage for all users. by Jeff Sharkey · 9 years ago
  89. 4dd2982 [init] start gatekeeperd after device decryption by Andres Morales · 9 years ago
  90. 17cf749 am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt" by Elliott Hughes · 9 years ago
  91. f4bb11d am 913ef1ca: Merge "Fixed a documentation error in protocol.txt" by Elliott Hughes · 9 years ago
  92. 25aabb9 Permission to view shared storage for all users. by Jeff Sharkey · 9 years ago
  93. 913ef1c Merge "Fixed a documentation error in protocol.txt" by Elliott Hughes · 9 years ago
  94. 36da715 Fixed a documentation error in protocol.txt by Derrick Bonafilia · 9 years ago
  95. d815178 Change init sequence to support file level encryption by Paul Lawrence · 9 years ago
  96. 2621f8e am 845f829f: am f9fd0d5a: Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes." by Calin Juravle · 9 years ago
  97. 845f829 am f9fd0d5a: Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes." by Calin Juravle · 9 years ago
  98. f9fd0d5 Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes." by Calin Juravle · 9 years ago
  99. 28042b5 Add static versions for libbacktrace and libnativebridge. Bug fixes. by Calin Juravle · 9 years ago
  100. b36b592 Replace all _LOG error calls with ALOGE. by Christopher Ferris · 9 years ago