1. ae46b50 Merge "Merge "Fix misc-macro-parentheses warnings." am: 945da9bbcd am: b3db6b8c3e" into nyc-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  2. 688d14a Merge "Fix misc-macro-parentheses warnings." am: 945da9bbcd am: b3db6b8c3e by Chih-hung Hsieh · 10 years ago
  3. 8572ee1 Merge "AudioTrack: Fix timestamp startup condition" into nyc-dev am: 5d8e3808b4 by Andy Hung · 10 years ago
  4. 2e75c84 Merge "audio flinger: fix audio patch release" into nyc-dev am: 5290766537 by Eric Laurent · 10 years ago
  5. b3db6b8 Merge "Fix misc-macro-parentheses warnings." am: 945da9bbcd by Chih-Hung Hsieh · 10 years ago
  6. 5d8e380 Merge "AudioTrack: Fix timestamp startup condition" into nyc-dev by Andy Hung · 10 years ago
  7. 5290766 Merge "audio flinger: fix audio patch release" into nyc-dev by Eric Laurent · 10 years ago
  8. 945da9b Merge "Fix misc-macro-parentheses warnings." by Chih-hung Hsieh · 10 years ago
  9. 0666cc5 audio flinger: fix audio patch release by Eric Laurent · 11 years ago
  10. 69488c4 AudioTrack: Fix timestamp startup condition by Andy Hung · 11 years ago
  11. 394040d Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev by Lajos Molnar · 10 years ago
  12. 76016cc Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev by Lajos Molnar · 10 years ago
  13. 07b2fbf stagefright: get profile/level from codec-specific-data by Lajos Molnar · 11 years ago
  14. 5cb96b8 Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev by Andy Hung · 10 years ago
  15. f3d9908 Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev by Andy Hung · 10 years ago
  16. 4d1522b resolve merge conflicts of 53529cf to nyc-dev-plus-aosp by Chih-Hung Hsieh · 10 years ago
  17. 53529cf Merge "Fix misc-macro-parentheses warnings." am: 7c05a8e156 by Chih-Hung Hsieh · 10 years ago
  18. 7c05a8e Merge "Fix misc-macro-parentheses warnings." by Chih-hung Hsieh · 10 years ago
  19. cc516cd Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check am: b2379ba0a3 by Eric Laurent · 10 years ago
  20. 8b269a1 Merge "audioflinger: Pass pid of process creating track or opening record" into nyc-dev by Haynes Mathew George · 10 years ago
  21. b2379ba Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check by Eric Laurent · 10 years ago
  22. a0e10ff Merge "audioflinger: Pass pid of process creating track or opening record" into nyc-dev by Eric Laurent · 10 years ago
  23. 4fce50b Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 am: daaece7f7c am: 413afa2586 -s ours by Marco Nelissen · 10 years ago
  24. ce71a85 Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 am: daaece7f7c by Marco Nelissen · 10 years ago
  25. 9ea77cd audioflinger: Pass pid of process creating track or opening record by Haynes Mathew George · 11 years ago
  26. 92a692a Merge "Camera: fix deadlock" into nyc-dev am: 7dd4ae63fe by Yin-Chia Yeh · 10 years ago
  27. 413afa2 Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 by Marco Nelissen · 10 years ago
  28. 7dd4ae6 Merge "Camera: fix deadlock" into nyc-dev by Yin-Chia Yeh · 10 years ago
  29. daaece7 Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 by Marco Nelissen · 10 years ago
  30. 7b86b75 Merge "limit mediaserver memory" into mnc-dev am: d64810330b by Marco Nelissen · 10 years ago
  31. d648103 Merge "limit mediaserver memory" into mnc-dev by Marco Nelissen · 10 years ago
  32. cc5a5f4 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 am: 9c0ffb143f am: d20ead8456 -s ours by Marco Nelissen · 10 years ago
  33. 34f2112 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 am: 9c0ffb143f by Marco Nelissen · 10 years ago
  34. 07b745e Add memory heap checks for mediaserver and audioserver by Andy Hung · 10 years ago
  35. d20ead8 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 by Marco Nelissen · 10 years ago
  36. 9c0ffb1 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 by Marco Nelissen · 10 years ago
  37. 6efa6e6 Merge "NuPlayer: remove the condition on sending BUFFERING_START event." into nyc-dev by Wei Jia · 10 years ago
  38. c5774ba Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours by Marco Nelissen · 10 years ago
  39. c7fc3e2 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 am: 6d44675bb4 am: 3d5d8388ba by Marco Nelissen · 10 years ago
  40. 4ecb8af Merge "NuPlayer: remove the condition on sending BUFFERING_START event." into nyc-dev by Wei Jia · 10 years ago
  41. d4b8036 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 am: 6d44675bb4 by Marco Nelissen · 10 years ago
  42. ad96965 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad by Marco Nelissen · 10 years ago
  43. 3d5d838 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 by Marco Nelissen · 10 years ago
  44. bfe8207 NuPlayer: remove the condition on sending BUFFERING_START event. by Wei Jia · 11 years ago
  45. 6d44675 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 by Marco Nelissen · 10 years ago
  46. 19db724 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours by Marco Nelissen · 10 years ago
  47. 361ba74 stagefright: add flags to NuMediaExtractor::getTrackFormat am: 768a2537a8 by Lajos Molnar · 10 years ago
  48. 4bd13b7 stagefright: get stream header information from MPEG2 video tracks by Lajos Molnar · 10 years ago
  49. 5440301 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 by Marco Nelissen · 10 years ago
  50. 8fd39c4 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce by Marco Nelissen · 10 years ago
  51. 6c1ad0d limit mediaserver memory by Marco Nelissen · 11 years ago
  52. 1094b53 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours by Marco Nelissen · 10 years ago
  53. 4e61b92 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 by Marco Nelissen · 10 years ago
  54. 61a1371 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours by Marco Nelissen · 10 years ago
  55. cbe7761 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 by Marco Nelissen · 10 years ago
  56. 57dc6d9 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 by Marco Nelissen · 10 years ago
  57. 473fad9 Camera: fix deadlock by Yin-Chia Yeh · 10 years ago
  58. e816dcc Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 by Marco Nelissen · 10 years ago
  59. 76f9ec3 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 by Marco Nelissen · 10 years ago
  60. 38ab87c Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 by Marco Nelissen · 10 years ago
  61. 41e0a50 Merge "limit mediaserver memory" into lmp-dev by Marco Nelissen · 10 years ago
  62. f8429c0 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev by Marco Nelissen · 10 years ago
  63. 768a253 stagefright: add flags to NuMediaExtractor::getTrackFormat by Lajos Molnar · 11 years ago
  64. 0dc8be9 stagefright: get stream header information from MPEG2 video tracks by Lajos Molnar · 11 years ago
  65. 1438f0b DO NOT MERGE limit mediaserver memory by Marco Nelissen · 11 years ago
  66. fc80447 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 am: f55cac801a am: b209b64a87 -s ours am: f76c474310 am: d3979cc41b am: d37cbe1f8c am: 05a8e6d6d9 -s ours by Marco Nelissen · 10 years ago
  67. f0f4f1e Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 am: f55cac801a am: b209b64a87 -s ours am: f76c474310 am: d3979cc41b am: d37cbe1f8c by Marco Nelissen · 10 years ago
  68. dbc6141 Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e am: bf68540a39 am: 8c6e115c87 by Marco Nelissen · 10 years ago
  69. 05a8e6d Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 am: f55cac801a am: b209b64a87 -s ours am: f76c474310 am: d3979cc41b by Marco Nelissen · 10 years ago
  70. 5f9925c Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e am: bf68540a39 by Marco Nelissen · 10 years ago
  71. d37cbe1 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 am: f55cac801a am: b209b64a87 -s ours am: f76c474310 by Marco Nelissen · 10 years ago
  72. d3979cc Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 am: f55cac801a am: b209b64a87 -s ours by Marco Nelissen · 10 years ago
  73. 8c6e115 Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e by Marco Nelissen · 10 years ago
  74. bf68540 Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 by Marco Nelissen · 10 years ago
  75. f76c474 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 am: f55cac801a by Marco Nelissen · 10 years ago
  76. 3633c0f Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 by Marco Nelissen · 10 years ago
  77. b209b64 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours am: 71b3486ba6 by Marco Nelissen · 10 years ago
  78. 90fe9f1 Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 by Marco Nelissen · 10 years ago
  79. 1d45547 Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 by Marco Nelissen · 10 years ago
  80. f55cac8 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours am: 748277a992 -s ours by Marco Nelissen · 10 years ago
  81. 71b3486 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd -s ours by Marco Nelissen · 10 years ago
  82. 6d1da7d Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad by Marco Nelissen · 10 years ago
  83. 748277a Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 by Marco Nelissen · 10 years ago
  84. 8fd8bfd Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 by Marco Nelissen · 10 years ago
  85. f6e3609 Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad by Marco Nelissen · 10 years ago
  86. 9897bd4 Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev by Marco Nelissen · 10 years ago
  87. 023f2a5 stagefright: fill in profile/level when reassembling AVCC am: 47d8891199 by Lajos Molnar · 10 years ago
  88. e5734d8 Merge "Check malloc result to avoid NPD" into lmp-dev by Marco Nelissen · 10 years ago
  89. fddbb1a Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev by Marco Nelissen · 10 years ago
  90. 47d8891 stagefright: fill in profile/level when reassembling AVCC by Lajos Molnar · 11 years ago
  91. 013ce69 Merge "stagefright: fix issues with bitrate handling" into nyc-dev by Lajos Molnar · 11 years ago
  92. 2b1a242 Merge "stagefright: fix issues with bitrate handling" into nyc-dev by Lajos Molnar · 11 years ago
  93. 5a3b797 Merge "Fix yet more overflows in amrwbenc" into nyc-dev am: b4f67b37e9 by Marco Nelissen · 11 years ago
  94. b4f67b3 Merge "Fix yet more overflows in amrwbenc" into nyc-dev by Marco Nelissen · 11 years ago
  95. 46f8016 stagefright: fix issues with bitrate handling by Lajos Molnar · 11 years ago
  96. 9f9c48f Merge "Fix misc-macro-parentheses warnings in drm_frameworks_common.h." am: fe18a6563f by Chih-hung Hsieh · 11 years ago
  97. 9315ef6 Merge "Fix misc-macro-parentheses warnings in drm_frameworks_common.h." by Chih-Hung Hsieh · 11 years ago
  98. fe18a65 Merge "Fix misc-macro-parentheses warnings in drm_frameworks_common.h." by Chih-hung Hsieh · 11 years ago
  99. f9b65f5 Fix misc-macro-parentheses warnings in drm_frameworks_common.h. by Chih-Hung Hsieh · 11 years ago
  100. f64686f Merge "Fix misc-macro-parentheses warnings." am: 64d4f64af0 am: 5405ce02c4 by Chih-hung Hsieh · 11 years ago