1. 29357bc Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 13 years ago
  2. d709ca9 am 20090b30: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  3. b470ec5 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  4. d9a4d0b merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  5. 0e5ace7 am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 by Eino-Ville Talvala · 13 years ago
  6. afb3f7f am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 by Eino-Ville Talvala · 13 years ago
  7. 60a78ac Switch camera sounds to always use the system enforced audio stream. by Eino-Ville Talvala · 13 years ago
  8. 5ff1dd5 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 13 years ago
  9. 8a08dcc Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" by Steve Block · 13 years ago
  10. 1dcd475 am d32ee5ba: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  11. 88592ec Merge "Remove the notion of "active track" from mixer" by Glenn Kasten · 13 years ago
  12. 22bf648 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  13. a2a0a5d Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" by Glenn Kasten · 13 years ago
  14. f6b1678 Use the standard CC_LIKELY and CC_UNLIKELY macros by Glenn Kasten · 13 years ago
  15. 7ab41c9 resolved conflicts for merge of 1a4b9939 to master by Eric Laurent · 13 years ago
  16. 1c03729 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  17. fe0698f am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 by Eric Laurent · 13 years ago
  18. df64d15 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE by Steve Block · 13 years ago
  19. b8a8052 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 13 years ago
  20. 071ccd5 audioflinger: fix clicks on 48kHz audio. by Eric Laurent · 13 years ago
  21. 9c56d4a Remove the notion of "active track" from mixer by Glenn Kasten · 13 years ago
  22. 94023fa am 21cb1290: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  23. 183c525 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  24. 12d9702 Merge "Remove dead code" by Glenn Kasten · 13 years ago
  25. bbaf867 Merge "audio effects: rename configure command" by Eric Laurent · 13 years ago
  26. 3d5188b audio effects: rename configure command by Eric Laurent · 13 years ago
  27. 81a028f Remove dead code by Glenn Kasten · 13 years ago
  28. e78950e Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed." by Hong Teng · 13 years ago
  29. f602a5f Merge "Use constants for 2 and 32" by Glenn Kasten · 13 years ago
  30. d1e672a Merge "Extract out audio DSP code to utility library" by Glenn Kasten · 13 years ago
  31. bf71f1e Use constants for 2 and 32 by Glenn Kasten · 13 years ago
  32. 8d0dd8b Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed. by Hong Teng · 13 years ago
  33. b92bc47 Merge "Use switch in AudioMixer::setParameter" by Glenn Kasten · 13 years ago
  34. 788040c Use switch in AudioMixer::setParameter by Glenn Kasten · 13 years ago
  35. 237a624 deleteTrackName now asserts on bad input parameter by Glenn Kasten · 13 years ago
  36. fee0357 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  37. 3b21c50 Extract out audio DSP code to utility library by Glenn Kasten · 13 years ago
  38. 154a7fb am 57ea96a4: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  39. a9798d3 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  40. 6d4bf6e Merge "setActiveTrack and setBufferProvider can't fail" by Glenn Kasten · 13 years ago
  41. b87c068 Merge "Simplify enable/disable mixing" by Glenn Kasten · 13 years ago
  42. f61ea45 SurfaceMediaSource: use the HW_TEXTURE usage bit by Jamie Gennis · 13 years ago
  43. 44beb98 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  44. b5aaa4a SurfaceMediaSource: use the HW_TEXTURE usage bit by Jamie Gennis · 13 years ago
  45. 255adce am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 by Dave Burke · 13 years ago
  46. 7e2f995 am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 by Dave Burke · 13 years ago
  47. 69aac3e SurfaceMediaSource: use the HW_TEXTURE usage bit by Jamie Gennis · 13 years ago
  48. 079123e Merge "Improve resistance to leaks for ConfigEvent" by Glenn Kasten · 13 years ago
  49. 26fa039 Merge "Use NULL not 0 for pointers" by Glenn Kasten · 13 years ago
  50. fba380a setActiveTrack and setBufferProvider can't fail by Glenn Kasten · 13 years ago
  51. 1c48c3c Simplify enable/disable mixing by Glenn Kasten · 13 years ago
  52. f3990f2 Improve resistance to leaks for ConfigEvent by Glenn Kasten · 13 years ago
  53. 2a8ce90 Merge "Fix build error when verbose logging is enabled" by Glenn Kasten · 13 years ago
  54. e0feee3 Use NULL not 0 for pointers by Glenn Kasten · 13 years ago
  55. a9960bc Fix build error when verbose logging is enabled by Glenn Kasten · 13 years ago
  56. 8df7a98 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  57. 4296893 Merge "Fix indentation and whitespace" by Glenn Kasten · 13 years ago
  58. a06a9a5 Merge "Improve AudioFlinger error logging" by Glenn Kasten · 13 years ago
  59. 53a166c Merge "AudioMixer uninitialized simple fields" by Glenn Kasten · 13 years ago
  60. 0cfd823 AudioMixer uninitialized simple fields by Glenn Kasten · 13 years ago
  61. d879601 Improve AudioFlinger error logging by Glenn Kasten · 13 years ago
  62. 2eda60a Merge "Audio C++ comments" by Glenn Kasten · 13 years ago
  63. c5ac4cb Fix indentation and whitespace by Glenn Kasten · 13 years ago
  64. f7d4ae9 am b14436d0: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  65. 3453bf6 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  66. d2bc4e0 Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck by James Dong · 13 years ago
  67. 1d33410 Merge "Remove unnecessary this->" by Glenn Kasten · 13 years ago
  68. c23bd9b Merge "Use const char correctly in AudioFlinger" by Glenn Kasten · 13 years ago
  69. e5dfcd8 Merge "Use units after all times" by Glenn Kasten · 13 years ago
  70. 738ed42 Merge "Delete obsolete includes" by Glenn Kasten · 13 years ago
  71. b299dc4 Merge "Remove redundant clear()" by Glenn Kasten · 13 years ago
  72. 505c529 Merge "Fix includes" by Glenn Kasten · 13 years ago
  73. 2135dad Merge "AudioTrack::setVolume check range" by Glenn Kasten · 13 years ago
  74. 362c4e6 Audio C++ comments by Glenn Kasten · 13 years ago
  75. 2a3d6e1 am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. by James Dong · 13 years ago
  76. 26c2a6b am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. by James Dong · 13 years ago
  77. d1d8f23 Fix includes by Glenn Kasten · 13 years ago
  78. 91eb8bf Remove redundant clear() by Glenn Kasten · 13 years ago
  79. ec1d6b5 Use const char correctly in AudioFlinger by Glenn Kasten · 13 years ago
  80. 9054897 Remove unnecessary this-> by Glenn Kasten · 13 years ago
  81. f0c4950 AudioTrack::setVolume check range by Glenn Kasten · 13 years ago
  82. 785ee06 Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck by James Dong · 13 years ago
  83. 7dede87 Use units after all times by Glenn Kasten · 13 years ago
  84. 5805f99 am 16bdd1e6: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  85. 50845c9 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  86. e4fe3a4 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  87. f4ebe8b am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 by Andreas Huber · 13 years ago
  88. d17ce3f am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 by Andreas Huber · 13 years ago
  89. 19e9d0f DO NOT MERGE: Support for parsing of "folded" RTSP header values by Andreas Huber · 13 years ago
  90. 6d3deee am da296533: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  91. df4856c Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  92. 5061489 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  93. 25b1e93 am 40375099: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  94. 50a4495 am f14dc291: Merge from ics-mr1 by The Android Open Source Project · 13 years ago
  95. fec2284 am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 by Jeff Tinker · 13 years ago
  96. d1b9f44 am 175d5d76: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  97. f2d86c8 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. by James Dong · 13 years ago
  98. 837b818 Delete obsolete includes by Glenn Kasten · 13 years ago
  99. 6af1e76 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" by Andreas Huber · 13 years ago
  100. 956a978 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago