1. 99c1a41 resolved conflicts for merge of 95a41f6b to stage-aosp-master by Colin Cross · 11 years ago
  2. 95a41f6 Merge changes Ia7b337e1,I7a2d8aa5,Iacc2b42b,Idf6100d1,If3fba2cc by Colin Cross · 11 years ago
  3. 5e484e9 init: fix copying boot properties by Colin Cross · 11 years ago
  4. 8196316 toolbox: hide property implementation from watchprops by Colin Cross · 12 years ago
  5. a5a860e init: verify size of property buffers passed to property_get by Colin Cross · 12 years ago
  6. 993b6ce init: move the system property writer implementation by Colin Cross · 12 years ago
  7. 1a6f4c3 init: switch property_get to use __system_property_get by Colin Cross · 12 years ago
  8. 520f4f0 am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB" by Elliott Hughes · 11 years ago
  9. 0173ebd am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK" by Elliott Hughes · 11 years ago
  10. 865bb05 Merge "adb: fix reported transfer size for transfer over 4 GiB" by Elliott Hughes · 11 years ago
  11. 5f8d9c0 Merge "adb: add vendor ID's for Nook, Haier, Hisense, and MTK" by Elliott Hughes · 11 years ago
  12. 71150ce adb: add vendor ID's for Nook, Haier, Hisense, and MTK by Jeff Smith · 11 years ago
  13. d9a1430 adb: fix reported transfer size for transfer over 4 GiB by Jeff Smith · 11 years ago
  14. 890f37d am c620f095: Merge "init: prevent action being added to the action_queue twice" by Colin Cross · 11 years ago
  15. c620f09 Merge "init: prevent action being added to the action_queue twice" by Colin Cross · 11 years ago
  16. 65d8ec0 am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc." by Elliott Hughes · 11 years ago
  17. 6ef0dfe Merge "Add a new test to crasher to upset dlmalloc." by Elliott Hughes · 11 years ago
  18. 6f40caf Add a new test to crasher to upset dlmalloc. by Elliott Hughes · 11 years ago
  19. 0a0a876 resolved conflicts for merge of c0df50af to stage-aosp-master by Colin Cross · 11 years ago
  20. c0df50a Merge "fix bad return value in dhcp_do_request_*" by Colin Cross · 11 years ago
  21. e9ab162 init: prevent action being added to the action_queue twice by Colin Cross · 12 years ago
  22. 897df50 fix bad return value in dhcp_do_request_* by Michael Wu · 11 years ago
  23. 603746f am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns" by Brian Carlstrom · 11 years ago
  24. 59fa7e1 Merge "Fixed reversed output in netstat Recv-Q Send-Q columns" by Brian Carlstrom · 11 years ago
  25. 3c412f6 Fixed reversed output in netstat Recv-Q Send-Q columns by Brian Carlstrom · 11 years ago
  26. 54d19aa Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  27. cd07446 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  28. 5cb9a02 am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev by Matthew Xie · 11 years ago
  29. 7e72349 Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev by Matthew Xie · 11 years ago
  30. 40a91a2 Add permission for bluetooth app in non-primary users by Matthew Xie · 11 years ago
  31. a9e08d3 am 51a2e4d5: Merge "libsysutils: fix null pointer and memory leak issue" by Colin Cross · 11 years ago
  32. 51a2e4d Merge "libsysutils: fix null pointer and memory leak issue" by Colin Cross · 11 years ago
  33. 084753e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  34. 149cbfd merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  35. 5f1a938 am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes" by Colin Cross · 11 years ago
  36. 3d8e8c1 am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes" by Colin Cross · 11 years ago
  37. 8f6adcf am 49be2407: Revert "Add logic to fixup file contexts after a policy update." by gcondra@google.com · 11 years ago
  38. 253e91b am 477e35d6: Revert "Add persistent property for SELinux enforcment status." by gcondra@google.com · 11 years ago
  39. 43329bc am 8a387870: Revert "Reload policy after setting up the data partition." by gcondra@google.com · 11 years ago
  40. f5410f2 am 3d32cd93: Revert "Remove /system from the dirs to relabel." by gcondra@google.com · 11 years ago
  41. b986664 am 52351300: Revert "Add a version check for SELinux policy on device." by gcondra@google.com · 11 years ago
  42. 9246f8d Merge "init.rc: remove duplicated led-related nodes" by Colin Cross · 11 years ago
  43. 544a7f7 libsysutils: fix null pointer and memory leak issue by Hong-Mei Li · 11 years ago
  44. a8d392d init.rc: remove duplicated led-related nodes by Sungmin Choi · 11 years ago
  45. 49be240 Revert "Add logic to fixup file contexts after a policy update." by repo sync · 11 years ago
  46. 477e35d Revert "Add persistent property for SELinux enforcment status." by repo sync · 11 years ago
  47. 8a38787 Revert "Reload policy after setting up the data partition." by repo sync · 11 years ago
  48. 3d32cd9 Revert "Remove /system from the dirs to relabel." by repo sync · 11 years ago
  49. 5235130 Revert "Add a version check for SELinux policy on device." by repo sync · 11 years ago
  50. 19ec15b Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  51. 3ce15fc am de1dadb7: Merge "Disable darwin build" by Brian Carlstrom · 11 years ago
  52. de1dadb Merge "Disable darwin build" by Brian Carlstrom · 11 years ago
  53. b0df2f1 Disable darwin build by Brian Carlstrom · 11 years ago
  54. 4a21072 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  55. 5a98566 am 921be8b6: Add a version check for SELinux policy on device. by gcondra@google.com · 11 years ago
  56. a817ff9 resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp by Brian Carlstrom · 11 years ago
  57. 07db297 Merge changes I5578fe06,I197b06c4 by Brian Carlstrom · 11 years ago
  58. 921be8b Add a version check for SELinux policy on device. by repo sync · 11 years ago
  59. 8905405 Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list(). by Elliott Hughes · 12 years ago
  60. bfec3a3 Add basic Darwin support to libcorkscrew. by Elliott Hughes · 12 years ago
  61. a64b3f0 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  62. ac5cf92 am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev by gcondra@google.com · 11 years ago
  63. 683aa89 Merge "Remove /system from the dirs to relabel." into jb-mr2-dev by repo sync · 11 years ago
  64. 3d4d07b Remove /system from the dirs to relabel. by repo sync · 11 years ago
  65. 6e46a3b am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev by Jamie Gennis · 11 years ago
  66. a1ee12c Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev by Jamie Gennis · 11 years ago
  67. 2b68e06 libcutils: add a trace tag for Dalvik by Jamie Gennis · 11 years ago
  68. 6119cff am 7382459e: Merge "Host builds: add fastboot and adb" by Ying Wang · 11 years ago
  69. 7382459 Merge "Host builds: add fastboot and adb" by Ying Wang · 11 years ago
  70. 928116c Host builds: add fastboot and adb by Kenny Root · 12 years ago
  71. 2f8b6a0 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  72. cb4b960 am 8794b2ee: Merge "Fix perms on /data/security" by Colin Cross · 11 years ago
  73. 803eda6 am f69cc564: Merge "Update ueventd set the SELinux context on sysfs" by Colin Cross · 11 years ago
  74. 55d69a9 am 032be7a4: Merge "Log an error if property pool is exhausted" by Colin Cross · 11 years ago
  75. 8794b2e Merge "Fix perms on /data/security" by Colin Cross · 11 years ago
  76. f69cc56 Merge "Update ueventd set the SELinux context on sysfs" by Colin Cross · 11 years ago
  77. 032be7a Merge "Log an error if property pool is exhausted" by Colin Cross · 11 years ago
  78. 63577d9 am fee250d2: Reload policy after setting up the data partition. by gcondra@google.com · 11 years ago
  79. fee250d Reload policy after setting up the data partition. by repo sync · 11 years ago
  80. d14586e resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp by Kenny Root · 11 years ago
  81. a69af5a Merge "Track change to JSSE provider" by Kenny Root · 11 years ago
  82. ca0404b Track change to JSSE provider by Kenny Root · 11 years ago
  83. 97de3e8 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  84. fd7ffb1 Log an error if property pool is exhausted by Johan Redestig · 11 years ago
  85. 14ad786 am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev by gcondra@google.com · 11 years ago
  86. 538b5d4 Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev by repo sync · 11 years ago
  87. b89bdfd Add persistent property for SELinux enforcment status. by repo sync · 11 years ago
  88. c0a29ae merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  89. 9e9ed1b am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev by Jeff Tinker · 11 years ago
  90. 131ee07 Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev by Jeff Tinker · 11 years ago
  91. 4c1840e am 5ea58543: Merge "mount: fix incorrect string length calculation" by Nick Kralevich · 11 years ago
  92. 5ea5854 Merge "mount: fix incorrect string length calculation" by Nick Kralevich · 11 years ago
  93. 29a5298 mount: fix incorrect string length calculation by Nick Kralevich · 11 years ago
  94. 0db6600 am 7ee2e26e: Remove DBUS from make and header files by Matthew Xie · 11 years ago
  95. 08d6430 Add a new group for MediaDrm engine plugins by Jeff Tinker · 11 years ago
  96. 82081f7 am cb6a842c: Merge "Add a stack overflow test to crasher, and document all the options." by Elliott Hughes · 11 years ago
  97. cb6a842 Merge "Add a stack overflow test to crasher, and document all the options." by Elliott Hughes · 11 years ago
  98. 3808c4e Add a stack overflow test to crasher, and document all the options. by Elliott Hughes · 11 years ago
  99. 7ee2e26 Remove DBUS from make and header files by Matthew Xie · 11 years ago
  100. fc1906d merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago