1. f5a486a resolved conflicts for merge of 79178b8b to master by Eric Laurent · 15 years ago
  2. 047f160 Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 by Eric Laurent · 15 years ago
  3. 7040b12 am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  4. fc1a3ac Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  5. 28bb5bd am 43e72b1f: (-s ours) 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
  6. 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
  7. ee74c46 DO NOT MERGE Poll input data with a small timeout and don't consume a full core. by Andreas Huber · 15 years ago
  8. 0bdcaf9 am e395f645: Poll input data with a small timeout and don\'t consume a full core. by Andreas Huber · 15 years ago
  9. 1183a4a Poll input data with a small timeout and don't consume a full core. by Andreas Huber · 15 years ago
  10. 91501f3 Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" by The Android Automerger · 15 years ago
  11. e926b99 merge in ics-factoryrom-2-release history after reset to ics-mr0 by The Android Automerger · 15 years ago
  12. ef7a789 am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  13. 254c221 Reconcile with ics-mr0-release ics-factoryrom-2-release by The Android Open Source Project · 15 years ago
  14. b47568c am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 by Chih-Chung Chang · 15 years ago
  15. 2db114b Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" by The Android Automerger · 15 years ago
  16. 5dc65e2 Fix problem in lvm effect bundle wrapper. by Eric Laurent · 15 years ago
  17. 14da736 Properly decode ADTS files with ID3 headers. by Andreas Huber · 15 years ago
  18. 09ebde7 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 by Chih-Chung Chang · 15 years ago
  19. 2cf981a Merge "Update camera continuous autofocus javadoc." into ics-mr0 by Chih-Chung Chang · 15 years ago
  20. 2aa4cc0 Support new HLS byte-range extensions by Andreas Huber · 15 years ago
  21. f208774 Merge "Bug 5522189 temporary workaround" by Glenn Kasten · 15 years ago
  22. 305f4b6 Bug 5522189 temporary workaround by Glenn Kasten · 15 years ago
  23. d7a07f2 am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1 by Andreas Huber · 15 years ago
  24. 841fa37 Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 by Andreas Huber · 15 years ago
  25. 4b8bb4e am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 by Jamie Gennis · 15 years ago
  26. 2626203 am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 by Jamie Gennis · 15 years ago
  27. c1aa1e9 am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 by James Dong · 15 years ago
  28. be1480b Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 by James Dong · 15 years ago
  29. 597f405 Update camera continuous autofocus javadoc. by Wu-cheng Li · 15 years ago
  30. bd1970a am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 by Andreas Huber · 15 years ago
  31. 0d681ab Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 by Andreas Huber · 15 years ago
  32. b05e3b5 Report call status from AudioSource::start() to file writer by James Dong · 15 years ago
  33. 7dae00b Stagefright: ANW::connect in MediaPlayerService by Jamie Gennis · 15 years ago
  34. a4af214 Properly report that we're no longer playing after receiving event by Andreas Huber · 15 years ago
  35. 783cfe3 am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0 by Jamie Gennis · 15 years ago
  36. 71adab5 am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0 by Jamie Gennis · 15 years ago
  37. 32bdfd5 Fix a reference to a stale pointer in AwesomePlayer. by Andreas Huber · 15 years ago
  38. 3856b09 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE by Steve Block · 15 years ago
  39. 1765d6e Stagefright: push blank buffers when tearing down by Jamie Gennis · 15 years ago
  40. 1d2acaf am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 by Dave Burke · 15 years ago
  41. 55f4bc5 Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 by Dave Burke · 15 years ago
  42. b1d666f Stagefright: idle OMX after ANW errors by Jamie Gennis · 15 years ago
  43. e6a823c am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced by Chih-Chung Chang · 15 years ago
  44. 8888a75 Fix 5487571: Make sure shutter sound is played when it's enforced by Chih-Chung Chang · 15 years ago
  45. d24bac2 am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0 by James Dong · 15 years ago
  46. 2e5bcd4 Merge "Check whether media recorder client exists before dumping." into ics-mr0 by James Dong · 15 years ago
  47. 545d1e9 am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0 by Eric Laurent · 15 years ago
  48. a85a74a Fix issue 381905: BassBoostTest CTS tests fail... by Eric Laurent · 15 years ago
  49. e579e28 Check whether media recorder client exists before dumping. by James Dong · 15 years ago
  50. 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
  51. 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
  52. 2ce9990 am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0 by Eric Laurent · 15 years ago
  53. 5e69eb9 Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). by James Dong · 15 years ago
  54. 5c4e818 Limit AudioFlinger log. by Eric Laurent · 15 years ago
  55. 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
  56. 3c57859 Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 by Chih-Chung Chang · 15 years ago
  57. 89770b4 am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 by Dave Burke · 15 years ago
  58. a038c14 Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0 by Dave Burke · 15 years ago
  59. 95c4d60 Don't hold onto the lock while reconnecting to the server by Andreas Huber · 15 years ago
  60. ff4f55c Fix 5468644: Use the proper audio stream type to play sound. by Chih-Chung Chang · 15 years ago
  61. 2bfdd42 NuPlayer is now taking on the task of streaming over RTSP. by Andreas Huber · 15 years ago
  62. f337772 Merge "Support for an MPEG2 Program Stream extractor." by Andreas Huber · 15 years ago
  63. 0cc79c6 MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size by Mike Lockwood · 15 years ago
  64. bbdb412 Improve camera javadoc and fix some errors. by Wu-cheng Li · 15 years ago
  65. a808bcb Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0 by Andreas Huber · 15 years ago
  66. 98a46cf Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS by Andreas Huber · 15 years ago
  67. 7019d22 Add video stabilization control to Camera parameters. by Eino-Ville Talvala · 15 years ago
  68. 49c5981 YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater by Andreas Huber · 15 years ago
  69. e87a2f0 Merge "Specifying -1 for both low and highwater marks would not actually do the right thing" by Andreas Huber · 15 years ago
  70. 0b8cd8b Specifying -1 for both low and highwater marks would not actually do the right thing by Andreas Huber · 15 years ago
  71. 5861a9a Add initialize method to CameraHardwareInterface by Tyler Luu · 15 years ago
  72. 003124e Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher" by Andreas Huber · 15 years ago
  73. 6c904e2 Merge "Allow shutter/recording sound to be adjusted unless it's forced." by Chih-Chung Chang · 15 years ago
  74. 3e754ef Merge "Allow Camera.setDisplayOrientation to be called when preview is active." by Wu-cheng Li · 15 years ago
  75. b9f5886 Allow Camera.setDisplayOrientation to be called when preview is active. by Wu-cheng Li · 15 years ago
  76. 90f4bc2 Allow shutter/recording sound to be adjusted unless it's forced. by Chih-Chung Chang · 15 years ago
  77. e46c970 Merge "Fix an issue where we should allow negative values but did not" by James Dong · 15 years ago
  78. a045cb0 Allow a system property "media.stagefright.cache-params" to override cache/prefetcher by Andreas Huber · 15 years ago
  79. 1b8ba61 Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files." by Andreas Huber · 15 years ago
  80. 788a07f Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files. by Andreas Huber · 15 years ago
  81. b832a03 Fix an issue where we should allow negative values but did not by James Dong · 15 years ago
  82. ec35a14 Fix issue 5381089: problem with A2DP music volume by Eric Laurent · 15 years ago
  83. d20bf06 Set crop params to ANative Window during Initialization. by Lakshman Gowda · 15 years ago
  84. 2944eca Support for an MPEG2 Program Stream extractor. by Andreas Huber · 15 years ago
  85. d3523f8 Gracefuly return on detecting wrong AAC format from corrupted files by Gilles-Arnaud Bleu-Laine · 15 years ago
  86. fea8f62 Merge "Support multiple NAL fragments per .mkv payload" by Andreas Huber · 15 years ago
  87. 792e33f Support multiple NAL fragments per .mkv payload by Andreas Huber · 15 years ago
  88. 5530493 Merge "Flush resets the count of played audio frames" by James Dong · 15 years ago
  89. 729de18 Support AMR, G.711 and vorbis audio in ACodec and friends. by Andreas Huber · 15 years ago
  90. 6c37549 Flush resets the count of played audio frames by James Dong · 15 years ago
  91. ac4d4d3 Merge "Cut down on AwesomePlayer and OMXCodec's verbosity." by Andreas Huber · 15 years ago
  92. c32589a Cut down on AwesomePlayer and OMXCodec's verbosity. by Andreas Huber · 15 years ago
  93. 1779946 Merge "Fix issue 5373658: memory leak in AudioFlinger." by Eric Laurent · 15 years ago
  94. dd115cd Merge "Signal an appropriate error even if there are no active streams yet." by Andreas Huber · 15 years ago
  95. eac68ba Signal an appropriate error even if there are no active streams yet. by Andreas Huber · 15 years ago
  96. 9d18ec5 Fix issue 5373658: memory leak in AudioFlinger. by Eric Laurent · 15 years ago
  97. 82fd03b Merge "Fix issue 5373048: AudioCache decode errors" by Eric Laurent · 15 years ago
  98. 9cb839a Fix issue 5373048: AudioCache decode errors by Eric Laurent · 15 years ago
  99. 797ab60 Reconcile with ics-factoryrom-release by The Android Open Source Project · 15 years ago
  100. 070b91e Merge "Properly connect to surface flinger in our shell tools" by Andreas Huber · 15 years ago