1. f2c5aff am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 15 years ago
  2. 0990dae am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 by Eric Laurent · 15 years ago
  3. b5d3403 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 by Glenn Kasten · 15 years ago
  4. a47b69c Fix regression for SoundPool playback by Eric Laurent · 15 years ago
  5. 1e2c415 am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1 by Andreas Huber · 15 years ago
  6. 0f31bfa resolved conflicts for merge of f3a892ab to ics-aah by Eric Laurent · 15 years ago
  7. 936a981 Merge "Remove surface legacy APIs and code." into ics-mr1 by Andreas Huber · 15 years ago
  8. e1a8a71 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 by Eric Laurent · 15 years ago
  9. c0d3b9a am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 by James Dong · 15 years ago
  10. 49e8271 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 by James Dong · 15 years ago
  11. d3011ec am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  12. 197388e Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  13. 683525b Bug 5478024 drop after decode if can't drop before by Glenn Kasten · 15 years ago
  14. 15d9183 DO NOT MERGE Poll input data with a small timeout and don't consume a full core. by Andreas Huber · 15 years ago
  15. ff7eb86 am 914972be: Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 by Eric Laurent · 15 years ago
  16. 93f6ba4 am 79178b8b: Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 by Eric Laurent · 15 years ago
  17. 4d954c4 Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 by Eric Laurent · 15 years ago
  18. 047f160 Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 by Eric Laurent · 15 years ago
  19. f8bbc7a am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  20. fc1a3ac Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  21. f47368b am 43e72b1f: am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 by Dave Burke · 15 years ago
  22. 654d83b am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 by Dave Burke · 15 years ago
  23. ee74c46 DO NOT MERGE Poll input data with a small timeout and don't consume a full core. by Andreas Huber · 15 years ago
  24. 3dbe320 AudioFlinger: mix track only when really ready by Eric Laurent · 15 years ago
  25. b518cf9 am e395f645: Poll input data with a small timeout and don\'t consume a full core. by Andreas Huber · 15 years ago
  26. 1183a4a Poll input data with a small timeout and don't consume a full core. by Andreas Huber · 15 years ago
  27. 91501f3 Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" by The Android Automerger · 15 years ago
  28. e926b99 merge in ics-factoryrom-2-release history after reset to ics-mr0 by The Android Automerger · 15 years ago
  29. fd57665 am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  30. 254c221 Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  31. 2db114b Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" by The Android Automerger · 15 years ago
  32. 5dc65e2 Fix problem in lvm effect bundle wrapper. by Eric Laurent · 15 years ago
  33. b643180 Fix device management in lvm effect bundle wrapper. by Eric Laurent · 15 years ago
  34. cfc2406 am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 by Chih-Chung Chang · 15 years ago
  35. 09ebde7 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 by Chih-Chung Chang · 15 years ago
  36. 2cf981a Merge "Update camera continuous autofocus javadoc." into ics-mr0 by Chih-Chung Chang · 15 years ago
  37. 2f5ef58 merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed) by Ed Heyl · 15 years ago
  38. 0656c64 keep previous history after reset to mr1 plus aah changes (ics-aah-wip) by Ed Heyl · 15 years ago
  39. 3901e5d Remove surface legacy APIs and code. by Andreas Huber · 15 years ago
  40. 841fa37 Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 by Andreas Huber · 15 years ago
  41. 6fe5bd8 Do not inline the audio resampler assembly functions by Jason Simmons · 15 years ago
  42. 07436fc Configure the A@H TX media player with one string by Jason Simmons · 15 years ago
  43. 3c56184 Ensure that the TRTP retry buffer has contiguous sequence numbers by Jason Simmons · 15 years ago
  44. 395575a Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer by Jason Simmons · 15 years ago
  45. 1a5e6b1 MediaPlayer changes for Tungsten/Android@Home. by Mike J. Chen · 15 years ago
  46. 033e42b Add media/libaah_rtp by Mike J. Chen · 15 years ago
  47. 94dacaf Add a missing NULL check. by John Grossman · 15 years ago
  48. 500e510 Media framework changes for Tungsten. by Mike J. Chen · 15 years ago
  49. 2626203 am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 by Jamie Gennis · 15 years ago
  50. ed3d89b Do not inline the audio resampler assembly functions by Jason Simmons · 15 years ago
  51. be1480b Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 by James Dong · 15 years ago
  52. 597f405 Update camera continuous autofocus javadoc. by Wu-cheng Li · 15 years ago
  53. 0d681ab Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 by Andreas Huber · 15 years ago
  54. 93594b5 Fix a hang issue where the first frame can be dropped for timelapse video recording. by James Dong · 15 years ago
  55. b05e3b5 Report call status from AudioSource::start() to file writer by James Dong · 15 years ago
  56. 7dae00b Stagefright: ANW::connect in MediaPlayerService by Jamie Gennis · 15 years ago
  57. a4af214 Properly report that we're no longer playing after receiving event by Andreas Huber · 15 years ago
  58. 448adcb undo reset to ics-mr1 until we have a better method by Ed Heyl · 15 years ago
  59. 71adab5 am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0 by Jamie Gennis · 15 years ago
  60. 32bdfd5 Fix a reference to a stale pointer in AwesomePlayer. by Andreas Huber · 15 years ago
  61. ca89aab reset to ics-mr1, but keep history by Ed Heyl · 15 years ago
  62. 4e6cf6b am 71f2cf11: (-s ours) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE by Steve Block · 15 years ago
  63. 3856b09 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE by Steve Block · 15 years ago
  64. 1765d6e Stagefright: push blank buffers when tearing down by Jamie Gennis · 15 years ago
  65. d7da7fc am 149a1493: am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 by Dave Burke · 15 years ago
  66. 1d2acaf am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 by Dave Burke · 15 years ago
  67. 55f4bc5 Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 by Dave Burke · 15 years ago
  68. b1d666f Stagefright: idle OMX after ANW errors by Jamie Gennis · 15 years ago
  69. b9f55dc am 38cdb606: am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced by Chih-Chung Chang · 15 years ago
  70. e6a823c am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced by Chih-Chung Chang · 15 years ago
  71. 8888a75 Fix 5487571: Make sure shutter sound is played when it's enforced by Chih-Chung Chang · 15 years ago
  72. 64ed644 am c7d92746: am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0 by James Dong · 15 years ago
  73. d24bac2 am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0 by James Dong · 15 years ago
  74. 2e5bcd4 Merge "Check whether media recorder client exists before dumping." into ics-mr0 by James Dong · 15 years ago
  75. af560cf am ee00c054: am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0 by Eric Laurent · 15 years ago
  76. 545d1e9 am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0 by Eric Laurent · 15 years ago
  77. a85a74a Fix issue 381905: BassBoostTest CTS tests fail... by Eric Laurent · 15 years ago
  78. e579e28 Check whether media recorder client exists before dumping. by James Dong · 15 years ago
  79. bfe938c am 3c563ce6: am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 by James Dong · 15 years ago
  80. ca9f7f2 am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 by James Dong · 15 years ago
  81. c4ff709 Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 by James Dong · 15 years ago
  82. d7b3932 am a6f4fb1f: am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0 by Eric Laurent · 15 years ago
  83. 2ce9990 am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0 by Eric Laurent · 15 years ago
  84. 5e69eb9 Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). by James Dong · 15 years ago
  85. 5c4e818 Limit AudioFlinger log. by Eric Laurent · 15 years ago
  86. 0fb0d7c am 21ad1d1c: am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 by Chih-Chung Chang · 15 years ago
  87. 5c5e2c6 am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 by Chih-Chung Chang · 15 years ago
  88. 3c57859 Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 by Chih-Chung Chang · 15 years ago
  89. ce4ae61 am 499e2522: am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 by Dave Burke · 15 years ago
  90. 89770b4 am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 by Dave Burke · 15 years ago
  91. a038c14 Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0 by Dave Burke · 15 years ago
  92. 95c4d60 Don't hold onto the lock while reconnecting to the server by Andreas Huber · 15 years ago
  93. ff4f55c Fix 5468644: Use the proper audio stream type to play sound. by Chih-Chung Chang · 15 years ago
  94. 0ae53bf resolved conflicts for merge of 6e80c50f to ics-aah by Andreas Huber · 15 years ago
  95. 2bfdd42 NuPlayer is now taking on the task of streaming over RTSP. by Andreas Huber · 15 years ago
  96. 7f1ce26 am 0eb6ef17: Merge "Support for an MPEG2 Program Stream extractor." by Andreas Huber · 15 years ago
  97. f337772 Merge "Support for an MPEG2 Program Stream extractor." by Andreas Huber · 15 years ago
  98. 37ae041 am 745e3601: am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0 by Mike Lockwood · 15 years ago
  99. 0cc79c6 MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size by Mike Lockwood · 15 years ago
  100. ff0b6e6 am 7a3ba4d7: am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0 by Wu-cheng Li · 15 years ago