1. dd80dde resolve merge conflicts of e04c941 to stage-aosp-master am: 0e61b46673 by Benoit Lamarche · 8 years ago
  2. 0e61b46 resolve merge conflicts of e04c941 to stage-aosp-master by Benoit Lamarche · 8 years ago
  3. e04c941 Merge "Set platform min sdk for Jack to o-b1" by Benoit Lamarche · 8 years ago
  4. 54eac25 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 am: 0deb783a52 by Dan Willemsen · 8 years ago
  5. 0deb783 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 by Dan Willemsen · 8 years ago
  6. 47b0322 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" by Treehugger Robot · 8 years ago
  7. 35ab684 Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 by Dan Willemsen · 8 years ago
  8. 55b1651 Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 by Dan Willemsen · 8 years ago
  9. bbc072f Merge "Remove aidl, proto, objc from soong_problems" by Treehugger Robot · 8 years ago
  10. 66509c3 Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4 by Dan Willemsen · 8 years ago
  11. f1e23b7 Merge "Soong now exports AIDL_CPP" am: 06a2daac72 by Dan Willemsen · 8 years ago
  12. 06a2daa Merge "Soong now exports AIDL_CPP" by Treehugger Robot · 8 years ago
  13. c077871 Tell Soong about TARGET_COPY_OUT_VENDOR by Dan Willemsen · 8 years ago
  14. a1c3183 Remove aidl, proto, objc from soong_problems by Dan Willemsen · 8 years ago
  15. 32b2831 Soong now exports AIDL_CPP by Dan Willemsen · 8 years ago
  16. 13f3b53 Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f by Adrien Schildknecht · 8 years ago
  17. ada51f3 Manually merge commit 'c13da91' into stage-aosp-master by The Android Automerger · 8 years ago
  18. c13da91 Merge "Add support for creating ext4 images with mke2fs" by Treehugger Robot · 8 years ago
  19. 59f8c3f Merge "Sort SELinux package inclusion." am: 15e1b5e239 am: d1b032237a by dcashman · 8 years ago
  20. d1b0322 Merge "Sort SELinux package inclusion." am: 15e1b5e239 by dcashman · 8 years ago
  21. 15e1b5e Merge "Sort SELinux package inclusion." by Treehugger Robot · 8 years ago
  22. 04158fa Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b by Colin Cross · 8 years ago
  23. 51c1eee Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b by Colin Cross · 8 years ago
  24. 1498712 Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" by Colin Cross · 8 years ago
  25. c316783 Sort SELinux package inclusion. by dcashman · 8 years ago
  26. edb09ad Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba by Marco Nelissen · 8 years ago
  27. 9b0f2de DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d by Marco Nelissen · 8 years ago
  28. 6127b67 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 by Marco Nelissen · 8 years ago
  29. 85e7856 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab by Marco Nelissen · 8 years ago
  30. 56aa9f1 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 by Marco Nelissen · 8 years ago
  31. 38ae17c DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a by Marco Nelissen · 8 years ago
  32. f38c580 Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 by Tao Bao · 8 years ago
  33. c65b6de Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours by Marco Nelissen · 8 years ago
  34. 3271170 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours by Marco Nelissen · 8 years ago
  35. eb9de30 Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 by Tao Bao · 8 years ago
  36. f8dc0c9 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 by Marco Nelissen · 8 years ago
  37. 58c4e2e DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 by Marco Nelissen · 8 years ago
  38. 37d1ec0 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 by Marco Nelissen · 8 years ago
  39. ac0ca8f DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 by Marco Nelissen · 8 years ago
  40. 22b2728 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 by Marco Nelissen · 8 years ago
  41. 7474d31 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 by Marco Nelissen · 8 years ago
  42. 6f45a5f Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours by Marco Nelissen · 8 years ago
  43. 8fc84f4 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours by Marco Nelissen · 8 years ago
  44. 0d45d96 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 by Marco Nelissen · 8 years ago
  45. 16ee67f DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada by Marco Nelissen · 8 years ago
  46. 14d24b3 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours by Marco Nelissen · 8 years ago
  47. 29ee191 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours by Marco Nelissen · 8 years ago
  48. 953a9eb Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev by Marco Nelissen · 8 years ago
  49. 0c041e9 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours by Marco Nelissen · 8 years ago
  50. 198262f Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev by Marco Nelissen · 8 years ago
  51. c180a06 Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f by Tao Bao · 8 years ago
  52. d07f999 Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f by Tao Bao · 8 years ago
  53. 06e14e4 Merge "Build recovery-two-step.img for two-step OTAs." by Tao Bao · 8 years ago
  54. 5360e01 Set platform min sdk for Jack to o-b1 by Yohann Roussel · 8 years ago
  55. 47ec5ab Build recovery-two-step.img for two-step OTAs. by Tao Bao · 8 years ago
  56. d42e97e Build recovery-two-step.img for two-step OTAs. by Tao Bao · 8 years ago
  57. 564a624 Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49 am: 0cc559f7d8 by Pirama Arumuga Nainar · 8 years ago
  58. 0cc559f Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49 by Pirama Arumuga Nainar · 8 years ago
  59. ec0d7cb Merge "Do not *directly* package libbcc.so" by Pirama Arumuga Nainar · 8 years ago
  60. dfff1ac Merge "releasetools: Remove dead parameter in GetBootableImage()." am: 8df4fea85f by Tao Bao · 8 years ago
  61. 2e3f1c5 Merge "releasetools: Remove dead parameter in GetBootableImage()." by Tao Bao · 8 years ago
  62. 8df4fea Merge "releasetools: Remove dead parameter in GetBootableImage()." by Tao Bao · 8 years ago
  63. 29a72d0 Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de by Paul Duffin · 8 years ago
  64. 74f8ee0 Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 by Paul Duffin · 8 years ago
  65. 32cc1f8 Merge "Replace core-junit with legacy-test" by Paul Duffin · 8 years ago
  66. 2a4336b releasetools: Remove dead parameter in GetBootableImage(). by Tao Bao · 8 years ago
  67. d5bda53 Merge changes from topic 'simplify_app_process_asan_modules' am: 9a3bd76ab4 by Andreas Gampe · 8 years ago
  68. 1b7e73a Revert "Build: Add sanitized app_process" am: 88d43677f5 am: d77b29fdb3 by Andreas Gampe · 8 years ago
  69. 75aa99b Revert "Build: Add asanwrapper in SANITIZE_LITE" am: 4938f3300a am: 92058120b2 by Andreas Gampe · 8 years ago
  70. d3708a5 Merge changes from topic 'simplify_app_process_asan_modules' am: 9a3bd76ab4 by Andreas Gampe · 8 years ago
  71. d77b29f Revert "Build: Add sanitized app_process" am: 88d43677f5 by Andreas Gampe · 8 years ago
  72. 9205812 Revert "Build: Add asanwrapper in SANITIZE_LITE" am: 4938f3300a by Andreas Gampe · 8 years ago
  73. 9a3bd76 Merge changes from topic 'simplify_app_process_asan_modules' by Treehugger Robot · 8 years ago
  74. 88d4367 Revert "Build: Add sanitized app_process" by Andreas Gampe · 8 years ago
  75. 4938f33 Revert "Build: Add asanwrapper in SANITIZE_LITE" by Andreas Gampe · 8 years ago
  76. 6dc32b2 Merge changes from topic 'app_process_sanitized_binaries' am: de24e6198e by Andreas Gampe · 8 years ago
  77. 18c9a0d Build: Add asanwrapper in SANITIZE_LITE am: eee31511f7 am: 3c326183ca by Andreas Gampe · 8 years ago
  78. 77541fe Build: Add sanitized app_process am: a35d92e431 am: 2ceff14391 by Andreas Gampe · 8 years ago
  79. 8875766 Merge changes from topic 'app_process_sanitized_binaries' am: de24e6198e by Andreas Gampe · 8 years ago
  80. 3c32618 Build: Add asanwrapper in SANITIZE_LITE am: eee31511f7 by Andreas Gampe · 8 years ago
  81. 2ceff14 Build: Add sanitized app_process am: a35d92e431 by Andreas Gampe · 8 years ago
  82. f3121cd Do not *directly* package libbcc.so by Pirama Arumuga Nainar · 8 years ago
  83. 7824073 DO NOT MERGE increase generic_mips system partition by Marco Nelissen · 8 years ago
  84. de24e61 Merge changes from topic 'app_process_sanitized_binaries' by Treehugger Robot · 8 years ago
  85. eee3151 Build: Add asanwrapper in SANITIZE_LITE by Andreas Gampe · 8 years ago
  86. 6470f4f Replace core-junit with legacy-test by Paul Duffin · 8 years ago
  87. a35d92e Build: Add sanitized app_process by Andreas Gampe · 8 years ago
  88. 724d458 Merge "Revert "Build: Bring back SDK dependencies"" am: 2bbeae7f8a by Andreas Gampe · 8 years ago
  89. f606cc1 Merge "Revert "Build: Bring back SDK dependencies"" am: 2bbeae7f8a by Andreas Gampe · 8 years ago
  90. 2bbeae7 Merge "Revert "Build: Bring back SDK dependencies"" by Treehugger Robot · 8 years ago
  91. 4c6efa0 Merge changes from topic 'basic_vndk' am: e69f15c9dc am: 474bba8831 by Dan Willemsen · 8 years ago
  92. 6e0c0da Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7 by Dan Willemsen · 8 years ago
  93. 2e300cd Add basic VNDK support in Make am: bab0fa6928 am: 323efd3035 by Dan Willemsen · 8 years ago
  94. 4d20d14 Remove GLOBAL_LD_DIRS am: e5836c4bb0 am: 28cf7d49ab by Dan Willemsen · 8 years ago
  95. 474bba8 Merge changes from topic 'basic_vndk' am: e69f15c9dc by Dan Willemsen · 8 years ago
  96. dc556b4 Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7 by Dan Willemsen · 8 years ago
  97. 323efd3 Add basic VNDK support in Make am: bab0fa6928 by Dan Willemsen · 8 years ago
  98. 28cf7d4 Remove GLOBAL_LD_DIRS am: e5836c4bb0 by Dan Willemsen · 8 years ago
  99. e69f15c Merge changes from topic 'basic_vndk' by Treehugger Robot · 8 years ago
  100. fe10963 Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES by Colin Cross · 8 years ago