1. e913431 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours am: c26850c970 by Narayan Kamath · 7 years ago
  2. 10677ee Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 by Narayan Kamath · 7 years ago
  3. 01e0911 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours by Narayan Kamath · 7 years ago
  4. fce6190 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df by Narayan Kamath · 7 years ago
  5. 831422d DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d by Narayan Kamath · 7 years ago
  6. e975d4e Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 by Narayan Kamath · 7 years ago
  7. ef7273e DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 by Narayan Kamath · 7 years ago
  8. aa9c65a Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 by Narayan Kamath · 7 years ago
  9. b183c6c DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 by Narayan Kamath · 7 years ago
  10. 5c24081 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 by Narayan Kamath · 7 years ago
  11. 72a2df2 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e by Narayan Kamath · 7 years ago
  12. b37dd8a Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 by Narayan Kamath · 7 years ago
  13. 2108099 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours by Narayan Kamath · 7 years ago
  14. 777998b Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f by Narayan Kamath · 7 years ago
  15. 25bcc25 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a by Narayan Kamath · 7 years ago
  16. b709664 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 by Narayan Kamath · 7 years ago
  17. 174bba1 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 by Narayan Kamath · 7 years ago
  18. 0298959 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d by Narayan Kamath · 7 years ago
  19. dc63432 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 by Narayan Kamath · 7 years ago
  20. 3fc9266 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f by Narayan Kamath · 7 years ago
  21. 158c91e DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours by Narayan Kamath · 7 years ago
  22. 97e0e07 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours by Narayan Kamath · 7 years ago
  23. 5a70ee3 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours by Narayan Kamath · 7 years ago
  24. d295d36 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 by Narayan Kamath · 7 years ago
  25. 9e0b83a Merge "init: add extra std::move" am: d72d92aee2 am: 7a23e13edb by Tom Cherry · 7 years ago
  26. b455f83 Merge "init: add extra std::move" am: d72d92aee2 by Tom Cherry · 7 years ago
  27. 03f6740 Merge "init: add extra std::move" by Treehugger Robot · 7 years ago
  28. 9589b2f Merge "bootstat: remove extraneous android_logcat_destroy." am: 6393c62e2e by Josh Gao · 7 years ago
  29. ff9f3e3 Merge "bootstat: remove extraneous android_logcat_destroy." am: 6393c62e2e by Josh Gao · 7 years ago
  30. 2650892 Merge "bootstat: remove extraneous android_logcat_destroy." by Treehugger Robot · 7 years ago
  31. 2641352 Merge "libbacktrace is not directly available to vendors" am: 22d2136d75 by Jiyong Park · 7 years ago
  32. 7c88338 Merge "libbacktrace is not directly available to vendors" am: 22d2136d75 by Jiyong Park · 7 years ago
  33. 67048f1 Merge "libbacktrace is not directly available to vendors" by Treehugger Robot · 7 years ago
  34. 5c7544f Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623 by Tom Cherry · 7 years ago
  35. 7bd81a7 Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623 by Tom Cherry · 7 years ago
  36. 0ef62fc Merge "init: wait_for_prop shouldn't run in a subcontext" by Treehugger Robot · 7 years ago
  37. 6fe84fc bootstat: remove extraneous android_logcat_destroy. by Josh Gao · 7 years ago
  38. 03ecb17 Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1 by Dan Willemsen · 7 years ago
  39. 6f4fb15 Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1 by Dan Willemsen · 7 years ago
  40. 57f47c6 Merge "Use target.linux for all linux kernel based targets" by Treehugger Robot · 7 years ago
  41. d7f8347 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours by Adam Vartanian · 7 years ago
  42. 80a345d init: add extra std::move by Tom Cherry · 7 years ago
  43. 0ae97e4 init: wait_for_prop shouldn't run in a subcontext by Tom Cherry · 7 years ago
  44. 2011915 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours by Adam Vartanian · 7 years ago
  45. 9f3a8ea Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours by Adam Vartanian · 7 years ago
  46. caf6eba Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours by Adam Vartanian · 7 years ago
  47. d7384bd Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours by Adam Vartanian · 7 years ago
  48. 79337f4 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours by Adam Vartanian · 7 years ago
  49. b2bfd98 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours by Adam Vartanian · 7 years ago
  50. cd0949d Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours by Adam Vartanian · 7 years ago
  51. 12aab90 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours by Adam Vartanian · 7 years ago
  52. 17b1128 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours by Adam Vartanian · 7 years ago
  53. 66bf914 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours by Adam Vartanian · 7 years ago
  54. b2f5bf5 Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 by Adam Vartanian · 7 years ago
  55. f901e58 Merge "Fix setting of map_offset in frame data." am: 8158d708c3 am: 57638bf967 by Christopher Ferris · 7 years ago
  56. 82c12c3 Merge "Fix setting of map_offset in frame data." am: 8158d708c3 by Christopher Ferris · 7 years ago
  57. c9eaa25 Merge "Fix setting of map_offset in frame data." by Christopher Ferris · 7 years ago
  58. 6aee84f Fix setting of map_offset in frame data. by Christopher Ferris · 7 years ago
  59. 4762b64 resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926 by Elliott Hughes · 7 years ago
  60. 74b464d resolve merge conflicts of 796987482 to stage-aosp-master by Elliott Hughes · 7 years ago
  61. 655ec93 Merge "<stdbool.h> not necessary in C++." by Treehugger Robot · 7 years ago
  62. 4e6a744 <stdbool.h> not necessary in C++. by Elliott Hughes · 8 years ago
  63. 1cb9836 Merge "Only allow UTF8 encoded property values" am: 4ff2607ef7 am: 9c767212eb by Tom Cherry · 7 years ago
  64. f611bf4 Merge "Only allow UTF8 encoded property values" am: 4ff2607ef7 by Tom Cherry · 7 years ago
  65. 0dbe309 Merge "Only allow UTF8 encoded property values" by Tom Cherry · 7 years ago
  66. 627f7fd Add vendor_available to liblog_headers. by Steven Moreland · 8 years ago
  67. 05d86d0 libutils: liblog export headers by Steven Moreland · 8 years ago
  68. 57cf034 Add vendor_available to liblog_headers. am: 95d7cbb77a -s ours by Steven Moreland · 7 years ago
  69. e1204fe libutils: liblog export headers am: 1f64241e2d -s ours by Steven Moreland · 7 years ago
  70. f95b541 Use target.linux for all linux kernel based targets by Dan Willemsen · 8 years ago
  71. 3365b73 Add vendor_available to liblog_headers. by Steven Moreland · 8 years ago
  72. f5ee4ff libutils: liblog export headers by Steven Moreland · 8 years ago
  73. 963b264 Only allow UTF8 encoded property values by Tom Cherry · 7 years ago
  74. 781d3f3 libbacktrace is not directly available to vendors by Jiyong Park · 8 years ago
  75. e7b4857 Merge "libkeymaster1 split" am: 06254de12a -s ours am: 876c7be912 -s ours by Jae Shin · 7 years ago
  76. 393e089 Merge "libkeymaster1 split" am: 06254de12a -s ours by Jae Shin · 7 years ago
  77. 8e79320 Merge "libkeymaster1 split" by Jae Shin · 7 years ago
  78. 59131e7 Merge "bootstat: test: duration fixes" am: 5126ce99de am: b684bd4e6a by Mark Salyzyn · 7 years ago
  79. bc04b48 Merge "bootstat: test: duration fixes" am: 5126ce99de by Mark Salyzyn · 7 years ago
  80. f41ca9e Merge "fs_mgr: removing is_device_secure()" am: af54c27e1b am: 6353d514e8 by Bowgo Tsai · 7 years ago
  81. 8f2fcf2 Merge "fs_mgr: removing is_device_secure()" am: af54c27e1b by Bowgo Tsai · 7 years ago
  82. 535c636 libkeymaster1 split by Janis Danisevskis · 8 years ago
  83. 084734d Merge "bootstat: test: duration fixes" by Mark Salyzyn · 7 years ago
  84. 4541da2 bootstat: test: duration fixes by Mark Salyzyn · 7 years ago
  85. 8272472 Merge "fs_mgr: removing is_device_secure()" by Treehugger Robot · 7 years ago
  86. b435808 fs_mgr: removing is_device_secure() by Bowgo Tsai · 7 years ago
  87. c6e97ce Merge "Move some properties users to __system_property_read_callback()" am: 4a5a337ef2 by Tom Cherry · 7 years ago
  88. cd1786f Merge "Move some properties users to __system_property_read_callback()" by Tom Cherry · 7 years ago
  89. 2e4c980 Merge "Move some properties users to __system_property_read_callback()" by Tom Cherry · 7 years ago
  90. ba310ce Merge "Allow setting read-only properties with value length > 92 characters" am: 96e8042e41 by Tom Cherry · 7 years ago
  91. dbaa619 Merge "Allow setting read-only properties with value length > 92 characters" by Tom Cherry · 7 years ago
  92. 4b5290c Merge "Allow setting read-only properties with value length > 92 characters" by Tom Cherry · 7 years ago
  93. 19d7a97 Merge "libsparse: fix building on linux host." am: 716488f53f am: bea330844a by Elliott Hughes · 7 years ago
  94. 111d59e Merge "libsparse: fix building on linux host." am: 716488f53f by Elliott Hughes · 7 years ago
  95. 857709d Merge "libsparse: fix building on linux host." by Elliott Hughes · 7 years ago
  96. 96cca93 Allow setting read-only properties with value length > 92 characters by Tom Cherry · 7 years ago
  97. b095314 Merge "Add support for boolean literals." am: 63a0008df7 am: 008f11fb5e by Christopher Ferris · 7 years ago
  98. a8531d9 Merge "Add support for boolean literals." am: 63a0008df7 by Christopher Ferris · 7 years ago
  99. 8b33d78 Merge "Add support for boolean literals." by Christopher Ferris · 7 years ago
  100. ef6aaf1 Merge "Add missing includes." am: 0c24d6ccea am: d166904f30 by Dan Albert · 7 years ago