1. 07d12fe Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev am: 3990c54224 am: c356b493c1 -s ours by Vignesh Venkatasubramanian · 11 years ago
  2. 8b8df3b Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev am: 3990c54224 by Vignesh Venkatasubramanian · 11 years ago
  3. c356b49 Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev by Vignesh Venkatasubramanian · 11 years ago
  4. 3990c54 Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev by Vignesh Venkatasubramanian · 11 years ago
  5. 8ac1a9f DO NOT MERGE - Remove deprecated image defines by Vignesh Venkatasubramanian · 11 years ago
  6. 1ab7985 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff by Eino-Ville Talvala · 11 years ago
  7. 295a488 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff by Eino-Ville Talvala · 11 years ago
  8. 0fefc97 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e by Eino-Ville Talvala · 11 years ago
  9. 8998239 resolve merge conflicts of 88b736a198 to lmp-dev. by Eino-Ville Talvala · 11 years ago
  10. 88b736a Camera: Disallow dumping clients directly am: c9ab2b0bb0 by Eino-Ville Talvala · 11 years ago
  11. c9ab2b0 Camera: Disallow dumping clients directly by Eino-Ville Talvala · 11 years ago
  12. 2304c60 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b by Marco Nelissen · 11 years ago
  13. e2e46f5 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e by Marco Nelissen · 11 years ago
  14. a8ac8f6 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e by Marco Nelissen · 11 years ago
  15. e6bd186 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 by Marco Nelissen · 11 years ago
  16. fb2eb86 Fix out-of-bounds write am: 5403587a74 by Marco Nelissen · 11 years ago
  17. 5403587 Fix out-of-bounds write by Marco Nelissen · 11 years ago
  18. 68e43cf fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e by Eric Laurent · 11 years ago
  19. df81fc3 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 by Eric Laurent · 11 years ago
  20. 5b7c20d fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 by Eric Laurent · 11 years ago
  21. 3a9d4f4 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 by Eric Laurent · 11 years ago
  22. baebc73 fix possible overflow in effect wrappers. am: 9e29523b95 by Eric Laurent · 11 years ago
  23. 9e29523 fix possible overflow in effect wrappers. by Eric Laurent · 11 years ago
  24. 1856f1f DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  25. 50270d9 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  26. 8348718 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c by Chong Zhang · 11 years ago
  27. 91a23ed DO NOT MERGE nuplayer: do not use cached source for wvm content by Chong Zhang · 12 years ago
  28. 9161b6a DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours by Andy Hung · 11 years ago
  29. 92edb17 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b by Andy Hung · 11 years ago
  30. f4dfde9 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours by Andy Hung · 11 years ago
  31. c565559 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 by Andy Hung · 11 years ago
  32. adfda28 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours by Andy Hung · 11 years ago
  33. 208bc47 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread by Andy Hung · 11 years ago
  34. bb1809a Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 by Andy Hung · 11 years ago
  35. ba49fda Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev by Andy Hung · 11 years ago
  36. 0c4d693 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev by Andy Hung · 11 years ago
  37. 3d6a714 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread by Andy Hung · 11 years ago
  38. e0c9d8a DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours by Wei Jia · 11 years ago
  39. db76a87 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 by Wei Jia · 11 years ago
  40. 862b693 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours by Wei Jia · 11 years ago
  41. 4c0d243 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 by Wei Jia · 11 years ago
  42. bed81d6 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours by Wei Jia · 11 years ago
  43. 9e1d775 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  44. e4223a8 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 by Wei Jia · 11 years ago
  45. 3e8e134 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  46. 6afc659 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  47. 0462975 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  48. 19c47af DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread by Andy Hung · 11 years ago
  49. 7b5564e GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 by Wei Jia · 11 years ago
  50. 92b6cd8 GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  51. 313358c GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  52. 09c291c GenericSource: reset mDecryptHandle when mDataSource is cleared. by Wei Jia · 11 years ago
  53. e01ba47 GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 by Wei Jia · 11 years ago
  54. 3fcddfd GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 by Wei Jia · 11 years ago
  55. 69c8e36 GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  56. 224858e GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  57. 8e4f531 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 by Jon Larimer · 11 years ago
  58. 699e9b0 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 by Jon Larimer · 11 years ago
  59. b44e95d Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d by Jon Larimer · 11 years ago
  60. 8565726 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc by Jon Larimer · 11 years ago
  61. 781cd4f Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev by Jon Larimer · 11 years ago
  62. b1a13d0 Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into klp-dev by Jon Larimer · 11 years ago
  63. 9299081 am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  64. b123192 am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  65. e550d21 am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  66. f70b69a Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  67. ce8029c am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  68. f5bff8c am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  69. 7d8bb7a am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  70. 149fc59 am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  71. 56d193a am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  72. 1f42a6c am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  73. 5a018d1 am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  74. c57ad1e am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  75. 0f21a68 Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  76. 55d1ea4 Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  77. 480f0ca am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev by Andy Hung · 11 years ago
  78. 9d1bc9f resolved conflicts for 4beea277 to lmp-mr1-dev by Andy Hung · 11 years ago
  79. 4beea27 am e5326d96: Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev by Andy Hung · 11 years ago
  80. e5326d9 Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev by Andy Hung · 11 years ago
  81. 1231bdb am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  82. 6f23532 am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  83. d4ee847 am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  84. d1c9037 Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  85. 77c185d stagefright: check bounds for MediaCodecList.getCodecInfo by Lajos Molnar · 11 years ago
  86. 7ea1ed8 am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  87. f106f9e am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  88. 1b6bb62 am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  89. 15e991b resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  90. 07d7031 am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  91. 0b1936b am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  92. dd184a4 am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  93. 0b09da7 am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev by Wei Jia · 11 years ago
  94. 04c02ee Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev by Wei Jia · 11 years ago
  95. 3b4a72a Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  96. 2482595 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer. by Wei Jia · 11 years ago
  97. 4a03d78 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer. by Wei Jia · 11 years ago
  98. d4df755 am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  99. 39f64a1 am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  100. 8b713f1 am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago