1. 2eda60a Merge "Audio C++ comments" by Glenn Kasten · 13 years ago
  2. f7d4ae9 am b14436d0: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  3. 3453bf6 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  4. d2bc4e0 Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck by James Dong · 13 years ago
  5. 1d33410 Merge "Remove unnecessary this->" by Glenn Kasten · 13 years ago
  6. c23bd9b Merge "Use const char correctly in AudioFlinger" by Glenn Kasten · 13 years ago
  7. e5dfcd8 Merge "Use units after all times" by Glenn Kasten · 13 years ago
  8. 738ed42 Merge "Delete obsolete includes" by Glenn Kasten · 13 years ago
  9. b299dc4 Merge "Remove redundant clear()" by Glenn Kasten · 13 years ago
  10. 505c529 Merge "Fix includes" by Glenn Kasten · 13 years ago
  11. 2135dad Merge "AudioTrack::setVolume check range" by Glenn Kasten · 13 years ago
  12. 362c4e6 Audio C++ comments by Glenn Kasten · 13 years ago
  13. 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
  14. 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
  15. d1d8f23 Fix includes by Glenn Kasten · 13 years ago
  16. 91eb8bf Remove redundant clear() by Glenn Kasten · 13 years ago
  17. ec1d6b5 Use const char correctly in AudioFlinger by Glenn Kasten · 13 years ago
  18. 9054897 Remove unnecessary this-> by Glenn Kasten · 13 years ago
  19. f0c4950 AudioTrack::setVolume check range by Glenn Kasten · 13 years ago
  20. 785ee06 Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck by James Dong · 13 years ago
  21. 7dede87 Use units after all times by Glenn Kasten · 13 years ago
  22. 5805f99 am 16bdd1e6: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  23. 50845c9 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  24. e4fe3a4 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  25. 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
  26. d17ce3f am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 by Andreas Huber · 13 years ago
  27. 19e9d0f DO NOT MERGE: Support for parsing of "folded" RTSP header values by Andreas Huber · 13 years ago
  28. 6d3deee am da296533: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  29. df4856c Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  30. 5061489 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  31. 25b1e93 am 40375099: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  32. 50a4495 am f14dc291: Merge from ics-mr1 by The Android Open Source Project · 13 years ago
  33. 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
  34. d1b9f44 am 175d5d76: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  35. f2d86c8 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. by James Dong · 13 years ago
  36. 837b8184 Delete obsolete includes by Glenn Kasten · 13 years ago
  37. 6af1e76 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" by Andreas Huber · 13 years ago
  38. 956a978 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  39. 2a82a3a Merge from ics-mr1 by The Android Open Source Project · 13 years ago
  40. d2927a7 Fix the build. (Change LOGV to ALOGV) by Owen Lin · 13 years ago
  41. a9d421d Fix drm enumeration order, resolves failure to play forward lock ringtones by Jeff Tinker · 13 years ago
  42. a3e52a8 am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 by Andreas Huber · 13 years ago
  43. aa5ba9a am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 by Andreas Huber · 13 years ago
  44. 7e2afc4 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  45. 4aae77c Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler by Andreas Huber · 13 years ago
  46. e154d13 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 13 years ago
  47. 901e78d am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 by Jeff Tinker · 13 years ago
  48. 736d814 am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 by Jeff Tinker · 13 years ago
  49. 7e976e9 Fix drm flag setting missed in false drm recognition fix. by Jeff Tinker · 13 years ago
  50. 2548688 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  51. 0de434f merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  52. 1da7ad1 am aadbd80b: Fixed the false drm recognition. by James Dong · 13 years ago
  53. d1fa3ca Fixed the false drm recognition. by James Dong · 13 years ago
  54. d9ee732 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  55. 3b42170 am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 by Andreas Huber · 13 years ago
  56. 62c54ce am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 by Andreas Huber · 13 years ago
  57. b7b9c7b Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 by Andreas Huber · 13 years ago
  58. ee736e9 Don't perform RTSP seeks right away but queue them for 200ms by Andreas Huber · 13 years ago
  59. 1906e5c Fix Bitreader "putBits" implementation, make sure we emulate timestamps by Andreas Huber · 13 years ago
  60. 68c79e2 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 13 years ago
  61. 089e654 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  62. d276313 am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 by Jeff Tinker · 13 years ago
  63. 894f3ca Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 by Jeff Tinker · 13 years ago
  64. 8e49b60 Fix ANRs due to Widevine DRM plugin sniff taking too long. by Jeff Tinker · 13 years ago
  65. eebecee am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 by Dave Burke · 13 years ago
  66. 59a6c28 am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 by Dave Burke · 13 years ago
  67. 2c170cd Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 by Dave Burke · 13 years ago
  68. bab4120 Fetch at least 192KB to avoid our mp3 sniffer from blocking on data. by Andreas Huber · 13 years ago
  69. 43afd55 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  70. 36d4f8f am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release by The Android Open Source Project · 13 years ago
  71. 1b37b40 am 3de8d36b: Reconcile with ics-mr0-release by The Android Open Source Project · 13 years ago
  72. 0c4ec12 Reconcile with ics-mr0-release by The Android Open Source Project · 13 years ago
  73. 44bec2e Merge "Allow data uris to be data sources" by Narayan Kamath · 13 years ago
  74. 1add684 am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 by Andreas Huber · 13 years ago
  75. 434e863 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  76. fcab2a8 am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 by Andreas Huber · 13 years ago
  77. 75e7c07 am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 by James Dong · 13 years ago
  78. 51a841a am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 by Andreas Huber · 13 years ago
  79. 7293614 Merge commit 'babb7200' into manualmerge by Andreas Huber · 13 years ago
  80. 01fe81c DO NOT MERGE: Remove the AVI extractor. by Andreas Huber · 13 years ago
  81. 78074d5 am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 by James Dong · 13 years ago
  82. e74de52 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 by James Dong · 13 years ago
  83. 4a51108 am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 by Andreas Huber · 13 years ago
  84. f7b5cdd DO NOT MERGE: Remove the AVI extractor. by Andreas Huber · 13 years ago
  85. 62157c6 DO NOT MERGE: Remove the AVI extractor. by Andreas Huber · 13 years ago
  86. 6c83e3b Allow data uris to be data sources by Narayan Kamath · 13 years ago
  87. c504807 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  88. 5f14e44 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  89. 2013d4d am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  90. c4ce69a am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  91. 9e603e0 Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  92. 223e70d DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames by James Dong · 13 years ago
  93. 456caf3 resolved conflicts for merge of 07bacabe to master by Andreas Huber · 13 years ago
  94. 1a733a3 am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1 by Andreas Huber · 13 years ago
  95. a0f2bf5 Properly identify how much metadata we need to cache in order to instantiate by Andreas Huber · 13 years ago
  96. 162b40b audioflinger: fix audio skipping over A2DP by Eric Laurent · 13 years ago
  97. 2158db0 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  98. 0cb4b9a am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 by Mike Lockwood · 13 years ago
  99. 326805a am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 by Mike Lockwood · 13 years ago
  100. 36126b2 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago