1. 9085507 Bug fixes in OMA DRM v1 Forward Lock Agent by Henrik B Andersson · 13 years ago
  2. 93a1e24 Merge "Stagefright: Return error if codec takes too long to return a buffer." by Jean-Baptiste Queru · 13 years ago
  3. e82c319 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  4. d94bb8b Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  5. 6f1dd23 am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  6. 4a02816 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  7. 3bfc65a am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  8. af7e972 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  9. a77079f Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  10. 24123b9 Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  11. e625479 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  12. aacb821 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  13. 3259fc9 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  14. ac04df0 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  15. 17e5dcb stagefright amrwbenc: Remove a duplicate, unused file by Martin Storsjo · 13 years ago
  16. 2a45921 stagefright: Only use __int64 on MSVC, not on all win32 compilers by Martin Storsjo · 13 years ago
  17. 267dbd8 stagefright aacenc: Make the mem_malloc function 64-bit safe by Martin Storsjo · 14 years ago
  18. ea1b2a4 stagefright: Include stdlib.h for malloc/free by Martin Storsjo · 14 years ago
  19. dab863f am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 13 years ago
  20. 2c32a92 Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 13 years ago
  21. 3021503 am a02d9bf9: Make sure we don\'t read from invalid fds by Marco Nelissen · 13 years ago
  22. 2bb7e36 Make sure we don't read from invalid fds by Marco Nelissen · 13 years ago
  23. 84f03d5 am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. by Andreas Huber · 13 years ago
  24. 26e0ac2 DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. by Andreas Huber · 14 years ago
  25. ac0aafc Tweak audio APIs for better forward/backward/sideways compatibility. by Jean-Baptiste Queru · 13 years ago
  26. 99bc051 stagefright aacenc: Mark codeWord as UWord16 by Martin Storsjo · 13 years ago
  27. f3664ae stagefright aacenc/amrwbenc: Remove trailing whitespace by Mans Rullgard · 13 years ago
  28. 41050cd stagefright aacenc/amrwbenc: Convert line breaks to Unix style by Mans Rullgard · 13 years ago
  29. 859e0c8 am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read. by Andreas Huber · 13 years ago
  30. 972c502 Stagefright: Return error if codec takes too long to return a buffer. by Anu Sundararajan · 13 years ago
  31. 0a89d84 DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read. by Andreas Huber · 13 years ago
  32. 16bc76a am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" by Brad Fitzpatrick · 13 years ago
  33. 0c0a1c0 audioflinger: Enable ARMv5TE optimized resampler by Jim Huang · 13 years ago
  34. 9a03bfb am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread by James Dong · 13 years ago
  35. c0995cd am 49b49f8f: Added include/private/hwui/DrawGlInfo.h by Russell Brenner · 13 years ago
  36. ba0de09 Added include/private/hwui/DrawGlInfo.h by Russell Brenner · 13 years ago
  37. 90fd5e0 When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE. by James Dong · 13 years ago
  38. 04b1447 am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 13 years ago
  39. 9dec491 MP3Extractor and MP3 decoder fixes - DO NOT MERGE by James Dong · 13 years ago
  40. d563b83 am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming. by Lorenzo Colitti · 13 years ago
  41. f64b241 am b9da16a1: Support IPv6 in HTTP streaming. by Lorenzo Colitti · 13 years ago
  42. 0ef6315 Support IPv6->IPv4 fallback in HTTP streaming. by Lorenzo Colitti · 13 years ago
  43. 7528e58 Support IPv6 in HTTP streaming. by Lorenzo Colitti · 14 years ago
  44. af50f11 am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch... by James Dong · 13 years ago
  45. 64bfdc7 Add missing copyright headers for a couple of files. DO NOT MERGE by James Dong · 13 years ago
  46. b8dc45f am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 13 years ago
  47. 9174299 DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 13 years ago
  48. 6d91a20 am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread by Andreas Huber · 13 years ago
  49. b81c1b6 DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary by Andreas Huber · 13 years ago
  50. 69686c4 am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers. by Andreas Huber · 13 years ago
  51. 3d7b550 DO NOT MERGE: Work around several issues with non-compliant RTSP servers. by Andreas Huber · 13 years ago
  52. e26308a am b083d3b8: Merge "Initialize resampling buffer per track." by Brad Fitzpatrick · 13 years ago
  53. 2151d7b Initialize resampling buffer per track. by Yuuhi Yamaguchi · 13 years ago
  54. 5c009b0 am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. by Andreas Huber · 13 years ago
  55. 4635eba DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. by Andreas Huber · 13 years ago
  56. c812fd3 am 0ef57993: Merge "Fix issue 2988031." into gingerbread by Eric Laurent · 13 years ago
  57. 5092d8c Fix issue 2988031. by Eric Laurent · 13 years ago
  58. 05b8794 am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. by Andreas Huber · 14 years ago
  59. 97a38b4 DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. by Andreas Huber · 14 years ago
  60. c39aa13 am 2ba92c71: do not merge bug 3370834 Cherrypick from master by Jean-Michel Trivi · 14 years ago
  61. bfa2f13 do not merge bug 3370834 Cherrypick from master by Jean-Michel Trivi · 14 years ago
  62. 1a082f3 am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread by Mathias Agopian · 14 years ago
  63. b1d0991 fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE) by Mathias Agopian · 14 years ago
  64. 958c063 am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread by Marco Nelissen · 14 years ago
  65. 47f44fb Merge "Increase the number of useful bits in the spectrum." into gingerbread by Marco Nelissen · 14 years ago
  66. 05adea4 am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder by Andreas Huber · 14 years ago
  67. 05b2217 DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder by Andreas Huber · 14 years ago
  68. 209821c Increase the number of useful bits in the spectrum. by Marco Nelissen · 14 years ago
  69. 2b61341 am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread by Eric Laurent · 14 years ago
  70. b23ef14 am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread by Dave Sparks · 14 years ago
  71. b517e00 do not merge - Fix issue 3371096. by Eric Laurent · 14 years ago
  72. 6e3edc2 DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor. by Andreas Huber · 14 years ago
  73. ea59c3e am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread by Andreas Huber · 14 years ago
  74. f4c056a DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect" by Andreas Huber · 14 years ago
  75. cf3592c merge 83fdc69e from gingerbread - do not merge by Jean-Baptiste Queru · 14 years ago
  76. 3ed1131 am a220a297: Merge "Initial OMA DRM forward lock contribution" by Gloria Wang · 14 years ago
  77. 13e05b3 Merge "Initial OMA DRM forward lock contribution" by Gloria Wang · 14 years ago
  78. 95304d5 Squash commits of the following patches, cherry-picked from other branch - do not merge. by James Dong · 14 years ago
  79. 72b228f am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed. by Andreas Huber · 14 years ago
  80. e490514 Fail to parse duration instead of asserting, if the server response cannot be parsed. by Andreas Huber · 14 years ago
  81. 4c0104e am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues by Andreas Huber · 14 years ago
  82. 9a0cf4f DO NOT MERGE: Fix Matroska issues by Andreas Huber · 14 years ago
  83. 960737e resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp by repo sync · 14 years ago
  84. 0d85990 DO NOT MERGE: Fix parsing of ntp= PLAY response. by Andreas Huber · 14 years ago
  85. 7b8a803 am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread by James Dong · 14 years ago
  86. 32c8335 Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge by James Dong · 14 years ago
  87. 9cfc9ef am 0544d059: Merge "DRM Framework bug fixes." by Gloria Wang · 14 years ago
  88. c2322f7 Merge "DRM Framework bug fixes." by Gloria Wang · 14 years ago
  89. e28b1e5 am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831 by Marco Nelissen · 14 years ago
  90. 288fb7e Add support for the "compilation" tag in mp3, mp4 and ogg, and also add by Marco Nelissen · 14 years ago
  91. e6bf51e am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread by James Dong · 14 years ago
  92. fdd65a0 Initial OMA DRM forward lock contribution by Pravat Dalbehera · 14 years ago
  93. 91dcf15 Suppress the recording sound in the recorded video by James Dong · 14 years ago
  94. 74de240 am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread by Eric Laurent · 14 years ago
  95. 0f01764 Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO. by Eric Laurent · 14 years ago
  96. 7d44e4d am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread by James Dong · 14 years ago
  97. e8079d0 When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again by James Dong · 14 years ago
  98. df1f37a am d57fbe88: Fixed a race condition where some recording frames may not be released by James Dong · 14 years ago
  99. b3e4084 Fixed a race condition where some recording frames may not be released by James Dong · 14 years ago
  100. 5c2ccf1 am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread by James Dong · 14 years ago