1. 790a852 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: 6202d11086 am: 320a603b32 by Narayan Kamath · 9 years ago
  2. ae4ccad resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d by Narayan Kamath · 9 years ago
  3. e0ac14a resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: 6202d11086 by Narayan Kamath · 9 years ago
  4. aaca841 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d by Narayan Kamath · 9 years ago
  5. 27d359e resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 by Narayan Kamath · 9 years ago
  6. a2f7d4e resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 by Narayan Kamath · 9 years ago
  7. b678576 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b by Narayan Kamath · 9 years ago
  8. d8b036e resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 by Narayan Kamath · 9 years ago
  9. db0c87e resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 by Narayan Kamath · 9 years ago
  10. 5ff756b resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 by Narayan Kamath · 9 years ago
  11. 0387c55 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours by Narayan Kamath · 9 years ago
  12. 7b62e0a resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 by Narayan Kamath · 9 years ago
  13. af43cd0 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 by Narayan Kamath · 9 years ago
  14. b5f75c4 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 by Narayan Kamath · 9 years ago
  15. 61f2755 resolve merge conflicts of a47780b to lmp-dev by Narayan Kamath · 9 years ago
  16. a47780b libzipfile: add additional validity checks. am: a1ec23634a am: c307830f5d by Narayan Kamath · 9 years ago
  17. c307830 libzipfile: add additional validity checks. am: a1ec23634a by Narayan Kamath · 9 years ago
  18. c08d3ee Merge "base: rename unique_fd::clear() to unique_fd::reset()." am: 14d3a1ac9d am: 8c9ecb9c2c by Josh Gao · 9 years ago
  19. a6f8ec3 Merge "base: rename unique_fd::clear() to unique_fd::reset()." am: 14d3a1ac9d by Josh Gao · 9 years ago
  20. a7a02f4 Merge "base: rename unique_fd::clear() to unique_fd::reset()." am: 14d3a1ac9d by Josh Gao · 9 years ago
  21. d6e4470 Merge "base: rename unique_fd::clear() to unique_fd::reset()." by Josh Gao · 9 years ago
  22. 5e7012f Merge "Fix warnings in libziparchive" am: 91811d2d34 am: 6f5edc78d8 by Colin Cross · 9 years ago
  23. 623cc00 Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE am: 1536654205 am: a1e35a5fb4 by Dan Willemsen · 9 years ago
  24. a1e991c Merge "Fix warnings in libziparchive" am: 91811d2d34 am: 6f5edc78d8 by Colin Cross · 9 years ago
  25. e9feeab Merge "Fix warnings in libziparchive" am: 91811d2d34 by Colin Cross · 9 years ago
  26. 58be4c1 Merge "Fix warnings in libziparchive" by Treehugger Robot · 9 years ago
  27. b6b2db5 Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE am: 1536654205 by Dan Willemsen · 9 years ago
  28. e8a38ca Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE by Dan Willemsen · 9 years ago
  29. d73194a Revert "Restrict pmsg use to eng builds." am: 1723f3fcd1 am: acf9f6d71b by Mark Salyzyn · 9 years ago
  30. 66b6d6f Revert "Restrict pmsg use to eng builds." am: 1723f3fcd1 by Mark Salyzyn · 9 years ago
  31. 20356f9 Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE by Dan Willemsen · 9 years ago
  32. c2afad9 Fix warnings in libziparchive by Colin Cross · 9 years ago
  33. 41a03de Revert "Restrict pmsg use to eng builds." by Mark Salyzyn · 9 years ago
  34. 4742623 Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" am: 4159568548 am: bcc419edad by Tao Wu · 9 years ago
  35. 6780b2f Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" am: 4159568548 by Tao Wu · 9 years ago
  36. a39f2bb Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" am: 4159568548 by Tao Wu · 9 years ago
  37. 63e7b06 Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" by Treehugger Robot · 9 years ago
  38. e4837f4 Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" am: 2c2a3f7a95 am: 3a9a16ee79 by Ajay Panicker · 9 years ago
  39. bc8ab28 Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" am: 2c2a3f7a95 by Ajay Panicker · 9 years ago
  40. c83e0c6 Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" by Ajay Panicker · 9 years ago
  41. 5f15048 Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" by Ajay Panicker · 9 years ago
  42. 0227826 base: rename unique_fd::clear() to unique_fd::reset(). by Josh Gao · 9 years ago
  43. ac3b7e7 Allow bluetooth service to access bluetooth directory and add /logs (1/6) by Ajay Panicker · 9 years ago
  44. fb0dc87 Merge "Move libusbhost's headers into libusbhost." am: 36b88ce975 am: c190d472ef by Elliott Hughes · 9 years ago
  45. 0468e8a Move libusbhost's headers into libusbhost. am: e0a7c773ed am: d141edfb3c by Elliott Hughes · 9 years ago
  46. 3a9b403 Merge "Move libusbhost's headers into libusbhost." am: 36b88ce975 am: c190d472ef by Elliott Hughes · 9 years ago
  47. 4ca9434 Move libusbhost's headers into libusbhost. am: e0a7c773ed am: d141edfb3c by Elliott Hughes · 9 years ago
  48. 59e89da Merge "Move libusbhost's headers into libusbhost." am: 36b88ce975 by Elliott Hughes · 9 years ago
  49. 31094ad Move libusbhost's headers into libusbhost. am: e0a7c773ed by Elliott Hughes · 9 years ago
  50. 5701748 Merge "Move libusbhost's headers into libusbhost." by Treehugger Robot · 9 years ago
  51. e12c4a8 Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT by Tao Wu · 9 years ago
  52. 64a6d2e Merge "Remove mutex.h and its uses." am: 33414a8b5f am: 88c992f080 by Pirama Arumuga Nainar · 9 years ago
  53. e3d9fa6 Merge "Remove mutex.h and its uses." am: 33414a8b5f am: 88c992f080 by Pirama Arumuga Nainar · 9 years ago
  54. d81b279 Merge "Remove mutex.h and its uses." am: 33414a8b5f by Pirama Arumuga Nainar · 9 years ago
  55. 95a3395 Merge "Remove mutex.h and its uses." by Pirama Arumuga Nainar · 9 years ago
  56. 9c3714d Remove mutex.h and its uses. by Pirama Arumuga Nainar · 9 years ago
  57. 456562b Merge "Use <condition_variable> and <mutex.h> from MinGW" am: a3d7b240f1 am: 331ec060ca by Pirama Arumuga Nainar · 9 years ago
  58. c73e0ed Merge "Use <condition_variable> and <mutex.h> from MinGW" am: a3d7b240f1 by Pirama Arumuga Nainar · 9 years ago
  59. d183cc5 Merge "Use <condition_variable> and <mutex.h> from MinGW" am: a3d7b240f1 by Pirama Arumuga Nainar · 9 years ago
  60. ed348d6 Merge "Use <condition_variable> and <mutex.h> from MinGW" by Pirama Arumuga Nainar · 9 years ago
  61. bbde04f Merge "Fix debuggerd argument parsing." am: 99ed65234c am: 014d9df418 by Elliott Hughes · 9 years ago
  62. 0879e8f Merge "Fix debuggerd argument parsing." am: 99ed65234c am: 014d9df418 by Elliott Hughes · 9 years ago
  63. 9d55e0a Merge "Fix debuggerd argument parsing." am: 99ed65234c by Elliott Hughes · 9 years ago
  64. 9cf014b Merge "Fix debuggerd argument parsing." by Treehugger Robot · 9 years ago
  65. 53e49a0 Merge "Fix warnings in cutils/atomic.h" am: 5e093f367c am: 6f292bcab9 by Colin Cross · 9 years ago
  66. 7907500 Merge "Fix warnings in cutils/atomic.h" am: 5e093f367c am: 6f292bcab9 by Colin Cross · 9 years ago
  67. b4cc96c Merge "Fix warnings in cutils/atomic.h" am: 5e093f367c by Colin Cross · 9 years ago
  68. bdf224c Merge "Fix warnings in cutils/atomic.h" by Treehugger Robot · 9 years ago
  69. 2b3f72f Merge "Move libbinderwrapper's headers into libbinderwrapper." am: 4127ccbda5 am: 97dd4017fb by Elliott Hughes · 9 years ago
  70. ea14dac Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa am: c5cc029993 by Elliott Hughes · 9 years ago
  71. d2c8f26 Merge "Move libbinderwrapper's headers into libbinderwrapper." am: 4127ccbda5 by Elliott Hughes · 9 years ago
  72. 6fe331e Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa by Elliott Hughes · 9 years ago
  73. 0e44966 Merge "Move libbinderwrapper's headers into libbinderwrapper." am: 4127ccbda5 by Elliott Hughes · 9 years ago
  74. a5822a4 Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa by Elliott Hughes · 9 years ago
  75. af7d5d0 Move libusbhost's headers into libusbhost. by Elliott Hughes · 9 years ago
  76. 955e8e7 Merge "Move libbinderwrapper's headers into libbinderwrapper." by Treehugger Robot · 9 years ago
  77. 16b3d60 Move libbinderwrapper's headers into libbinderwrapper. by Elliott Hughes · 9 years ago
  78. c4d6910 Fix warnings in cutils/atomic.h by Colin Cross · 9 years ago
  79. f8b0485 Fix debuggerd argument parsing. by Elliott Hughes · 9 years ago
  80. 7284477 Merge changes I0a00b3d4,I19cb0694 am: 67855d8454 am: ba4a61348d am: 60cc3c37ec by Josh Gao · 9 years ago
  81. 3850f02 adb: let `adb push` follow symlinks. am: 94dc19ff57 am: 30ecda227c by Josh Gao · 9 years ago
  82. dee7f8b base: add parameter that controls O_NOFOLLOW in file functions. am: ffabc9651f am: 493c215aa2 by Josh Gao · 9 years ago
  83. 0664315 Merge changes I0a00b3d4,I19cb0694 am: 67855d8454 am: ba4a61348d by Josh Gao · 9 years ago
  84. 13b4fc8 adb: let `adb push` follow symlinks. am: 94dc19ff57 am: 30ecda227c by Josh Gao · 9 years ago
  85. 7ac7c45 base: add parameter that controls O_NOFOLLOW in file functions. am: ffabc9651f by Josh Gao · 9 years ago
  86. f6cc61e Merge changes I0a00b3d4,I19cb0694 am: 67855d8454 by Josh Gao · 9 years ago
  87. c4ee467 adb: let `adb push` follow symlinks. am: 94dc19ff57 by Josh Gao · 9 years ago
  88. 5fdbcab base: add parameter that controls O_NOFOLLOW in file functions. am: ffabc9651f by Josh Gao · 9 years ago
  89. b4ebb58 Merge changes I0a00b3d4,I19cb0694 by Treehugger Robot · 9 years ago
  90. 0fccd01 adb: let `adb push` follow symlinks. by Josh Gao · 9 years ago
  91. e202478 base: add parameter that controls O_NOFOLLOW in file functions. by Josh Gao · 9 years ago
  92. bedfe74 Merge "Fix darwin build break." am: 1a73e9b7e2 am: 8fc46f7c6c am: 50ccd9a7aa by Josh Gao · 9 years ago
  93. 2ecefce Merge "Fix darwin build break." am: 1a73e9b7e2 am: 8fc46f7c6c by Josh Gao · 9 years ago
  94. 79e08a3 Merge "Fix darwin build break." am: 1a73e9b7e2 by Josh Gao · 9 years ago
  95. 8d3bebf Merge "Fix darwin build break." by Josh Gao · 9 years ago
  96. 59e3f75 Fix darwin build break. by Josh Gao · 9 years ago
  97. 596829c Merge changes Ie15fcb8f,I0a895911 am: c9c555b8dd am: 173c1fefe6 am: a93f3036a0 by Josh Gao · 9 years ago
  98. 2027aa8 base: add quick_exit emulation. am: 0c44256ae4 am: 63b499d93d am: b2bc800270 by Josh Gao · 9 years ago
  99. 00527b1 base: extract mutex.h from logging.cpp. am: 63bdcb57aa am: c55eba3a6e by Josh Gao · 9 years ago
  100. dea39d2 Merge changes Ie15fcb8f,I0a895911 am: c9c555b8dd am: 173c1fefe6 by Josh Gao · 9 years ago