1. 2bbafc1 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 · 10 years ago
  2. 3a53e2c 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 · 10 years ago
  3. b8f35dd resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 by Narayan Kamath · 10 years ago
  4. 7d106d5 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 by Narayan Kamath · 10 years ago
  5. de03f5a resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours by Narayan Kamath · 10 years ago
  6. c681771 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 by Narayan Kamath · 10 years ago
  7. af43cd0 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 by Narayan Kamath · 10 years ago
  8. b5f75c45 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 by Narayan Kamath · 10 years ago
  9. 61f2755 resolve merge conflicts of a47780b to lmp-dev by Narayan Kamath · 10 years ago
  10. a47780b libzipfile: add additional validity checks. am: a1ec23634a am: c307830f5d by Narayan Kamath · 10 years ago
  11. c307830 libzipfile: add additional validity checks. am: a1ec23634a by Narayan Kamath · 10 years ago
  12. a1ec236 libzipfile: add additional validity checks. by Narayan Kamath · 10 years ago
  13. 4eb04cb liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d am: 49d5582f29 by Mark Salyzyn · 10 years ago
  14. 1b1b6a4 liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d am: 49d5582f29 by Mark Salyzyn · 10 years ago
  15. 49d5582 liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d by Mark Salyzyn · 10 years ago
  16. f72c9bc liblog: add __android_log_close() am: b1b5d507cb by Mark Salyzyn · 10 years ago
  17. bd36696 liblog: add __android_log_close() by Mark Salyzyn · 10 years ago
  18. ed4d8ac Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 am: baa3f2bdb2 am: 8013db9c75 am: a55e9f01fb by Narayan Kamath · 10 years ago
  19. 3213ec2 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 am: 5f04ac60d6 am: 4d12c20a5e am: e09c5d2ce4 by Mark Salyzyn · 10 years ago
  20. b1b5d50 liblog: add __android_log_close() by Mark Salyzyn · 10 years ago
  21. e5a1c7d Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 am: baa3f2bdb2 am: 8013db9c75 by Narayan Kamath · 10 years ago
  22. 68afb45 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 am: 5f04ac60d6 am: 4d12c20a5e by Mark Salyzyn · 10 years ago
  23. a55e9f0 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 am: baa3f2bdb2 by Narayan Kamath · 10 years ago
  24. e09c5d2 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 am: 5f04ac60d6 by Mark Salyzyn · 10 years ago
  25. 8013db9 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 by Narayan Kamath · 10 years ago
  26. 4d12c20 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 by Mark Salyzyn · 10 years ago
  27. 356988f liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6 am: cfea0949a4 am: 87f09ae506 am: c1197f5b67 by Mark Salyzyn · 10 years ago
  28. baa3f2b Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f by Narayan Kamath · 10 years ago
  29. 5f04ac6 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 by Mark Salyzyn · 10 years ago
  30. f3af438 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6 am: cfea0949a4 am: 87f09ae506 by Mark Salyzyn · 10 years ago
  31. ffb34de Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 by Narayan Kamath · 10 years ago
  32. 94ebdd6 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 by Mark Salyzyn · 10 years ago
  33. c1197f5 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6 am: cfea0949a4 by Mark Salyzyn · 10 years ago
  34. 87f09ae liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6 by Mark Salyzyn · 10 years ago
  35. 0f6c4a0 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 by Narayan Kamath · 10 years ago
  36. 7b16dcf liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef by Mark Salyzyn · 10 years ago
  37. cfea094 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 by Mark Salyzyn · 10 years ago
  38. 1b9ae6e liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a by Mark Salyzyn · 10 years ago
  39. 2f16f2b Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 by Narayan Kamath · 10 years ago
  40. 3b2fa3e liblog: add __android_log_close() am: 2d14969155 by Mark Salyzyn · 10 years ago
  41. edbf5d5 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d by Mark Salyzyn · 10 years ago
  42. 1b6b347 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours by Mark Salyzyn · 10 years ago
  43. 0414412 Merge "liblog: add __android_log_close()" into lmp-dev by Narayan Kamath · 10 years ago
  44. ef661e0 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 by Mark Salyzyn · 10 years ago
  45. 85b0dd6 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 by Mark Salyzyn · 10 years ago
  46. edc5507 liblog: add __android_log_close() am: c68706fe49 by Mark Salyzyn · 10 years ago
  47. 2d14969 liblog: add __android_log_close() by Mark Salyzyn · 10 years ago
  48. c68706f liblog: add __android_log_close() by Mark Salyzyn · 10 years ago
  49. 2f16eee Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc am: 2427a462c0 by Connor O'Brien · 10 years ago
  50. 6b155c1 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc by Connor O'Brien · 10 years ago
  51. 2427a46 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 by Connor O'Brien · 10 years ago
  52. 2b5e6d8 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 by Connor O'Brien · 10 years ago
  53. 2f78b2c Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb by Connor O'Brien · 10 years ago
  54. 9745b11 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 by Connor O'Brien · 10 years ago
  55. e04054d Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 by Connor O'Brien · 10 years ago
  56. 2fadbb9 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a by Connor O'Brien · 10 years ago
  57. b906ad8 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c by Connor O'Brien · 10 years ago
  58. 109024f7 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c by Connor O'Brien · 10 years ago
  59. e9e046d Fix vold vulnerability in FrameworkListener am: 470484d2a2 by Connor O'Brien · 10 years ago
  60. 470484d Fix vold vulnerability in FrameworkListener by Connor O'Brien · 10 years ago
  61. 9008a5c Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473 am: c0e52f145e am: 2b16e16142 by Josh Gao · 10 years ago
  62. 2eecaed DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b am: 3e59e93c71 am: a44a3ae938 by Josh Gao · 10 years ago
  63. c8d2050 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473 am: c0e52f145e by Josh Gao · 10 years ago
  64. 240289e DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b am: 3e59e93c71 by Josh Gao · 10 years ago
  65. 2b16e16 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473 by Josh Gao · 10 years ago
  66. a44a3ae DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b by Josh Gao · 10 years ago
  67. c0e52f1 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours by Josh Gao · 10 years ago
  68. 3e59e93 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours by Josh Gao · 10 years ago
  69. 0790936 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca by Josh Gao · 10 years ago
  70. dc83f18 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 by Josh Gao · 10 years ago
  71. fdb4cd4 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b by Josh Gao · 10 years ago
  72. 48cd7dd DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 by Josh Gao · 10 years ago
  73. 9183477 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours by Josh Gao · 10 years ago
  74. b92fecf DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours by Josh Gao · 10 years ago
  75. 55259f3 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours by Josh Gao · 10 years ago
  76. 7fe65ab DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours by Josh Gao · 10 years ago
  77. 58dd6f7 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a by Josh Gao · 10 years ago
  78. 2071bcf DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours by Josh Gao · 10 years ago
  79. 7ed0995 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee by Josh Gao · 10 years ago
  80. be9d9fc DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee by Josh Gao · 10 years ago
  81. ac3fbb1 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev by Josh Gao · 10 years ago
  82. 8f7cc0e DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. by Josh Gao · 10 years ago
  83. 23effb0 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev by Josh Gao · 10 years ago
  84. cfb8b6a Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 by Josh Gao · 10 years ago
  85. 8b2a975 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 by Josh Gao · 10 years ago
  86. 8dad649 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 by Josh Gao · 10 years ago
  87. 09b5b49 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f by Josh Gao · 10 years ago
  88. 00d389f Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c by Josh Gao · 10 years ago
  89. 5cee87e DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e by Josh Gao · 10 years ago
  90. 015d662 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev by Josh Gao · 10 years ago
  91. 5c4bf3d DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e by Josh Gao · 10 years ago
  92. 73c59ad Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev by TreeHugger Robot · 10 years ago
  93. 804de7a DO NOT MERGE: adb: reenable (and fix) Windows build. by Josh Gao · 10 years ago
  94. 364188b debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 by Josh Gao · 10 years ago
  95. 647ec18 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 by Josh Gao · 10 years ago
  96. 073f731 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f by Josh Gao · 10 years ago
  97. fe59793 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f by Josh Gao · 10 years ago
  98. 8b6b654 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). by Josh Gao · 10 years ago
  99. 77374d6 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 0528829b73 -s ours am: b9b6ec3644 am: 5920345eeb am: cb4d905c96 -s ours am: e467cced5c am: 174579d6ef am: a3a674ea10 by Josh Gao · 10 years ago
  100. be2e5ea DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 36dd144367 am: 9048b3bb8e am: 6cb199bf4a -s ours am: 851f840835 am: be484f3f7b am: 1e1eae1992 by Josh Gao · 10 years ago