1. 50a4495 am f14dc291: Merge from ics-mr1 by The Android Open Source Project · 13 years ago
  2. 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
  3. d1b9f44 am 175d5d76: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  4. f2d86c8 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. by James Dong · 13 years ago
  5. 837b8184 Delete obsolete includes by Glenn Kasten · 13 years ago
  6. 6af1e76 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" by Andreas Huber · 13 years ago
  7. 956a978 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  8. 2a82a3a Merge from ics-mr1 by The Android Open Source Project · 13 years ago
  9. d2927a7 Fix the build. (Change LOGV to ALOGV) by Owen Lin · 13 years ago
  10. a9d421d Fix drm enumeration order, resolves failure to play forward lock ringtones by Jeff Tinker · 13 years ago
  11. 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
  12. aa5ba9a am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 by Andreas Huber · 13 years ago
  13. 7e2afc4 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  14. 4aae77c Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler by Andreas Huber · 13 years ago
  15. e154d13 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 13 years ago
  16. 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
  17. 736d814 am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 by Jeff Tinker · 13 years ago
  18. 7e976e9 Fix drm flag setting missed in false drm recognition fix. by Jeff Tinker · 13 years ago
  19. 2548688 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  20. 0de434f merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  21. 1da7ad1 am aadbd80b: Fixed the false drm recognition. by James Dong · 13 years ago
  22. d1fa3ca Fixed the false drm recognition. by James Dong · 13 years ago
  23. d9ee732 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  24. 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
  25. 62c54ce am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 by Andreas Huber · 13 years ago
  26. b7b9c7b Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 by Andreas Huber · 13 years ago
  27. ee736e9 Don't perform RTSP seeks right away but queue them for 200ms by Andreas Huber · 13 years ago
  28. 1906e5c Fix Bitreader "putBits" implementation, make sure we emulate timestamps by Andreas Huber · 13 years ago
  29. 68c79e2 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 13 years ago
  30. 089e654 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  31. d276313 am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 by Jeff Tinker · 13 years ago
  32. 894f3ca Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 by Jeff Tinker · 13 years ago
  33. 8e49b60 Fix ANRs due to Widevine DRM plugin sniff taking too long. by Jeff Tinker · 13 years ago
  34. 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
  35. 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
  36. 2c170cd Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 by Dave Burke · 13 years ago
  37. bab4120 Fetch at least 192KB to avoid our mp3 sniffer from blocking on data. by Andreas Huber · 13 years ago
  38. 43afd55 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  39. 36d4f8f am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release by The Android Open Source Project · 13 years ago
  40. 1b37b40 am 3de8d36b: Reconcile with ics-mr0-release by The Android Open Source Project · 13 years ago
  41. 0c4ec12 Reconcile with ics-mr0-release by The Android Open Source Project · 13 years ago
  42. 44bec2e Merge "Allow data uris to be data sources" by Narayan Kamath · 13 years ago
  43. 1add684 am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 by Andreas Huber · 13 years ago
  44. 434e863 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  45. fcab2a8 am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 by Andreas Huber · 13 years ago
  46. 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
  47. 51a841a am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 by Andreas Huber · 13 years ago
  48. 7293614 Merge commit 'babb7200' into manualmerge by Andreas Huber · 13 years ago
  49. 01fe81c DO NOT MERGE: Remove the AVI extractor. by Andreas Huber · 13 years ago
  50. 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
  51. 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
  52. 4a51108 am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 by Andreas Huber · 13 years ago
  53. f7b5cdd DO NOT MERGE: Remove the AVI extractor. by Andreas Huber · 13 years ago
  54. 62157c6 DO NOT MERGE: Remove the AVI extractor. by Andreas Huber · 13 years ago
  55. 6c83e3b Allow data uris to be data sources by Narayan Kamath · 13 years ago
  56. c504807 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  57. 5f14e44 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  58. 2013d4d am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  59. c4ce69a am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  60. 9e603e0 Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  61. 223e70d DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames by James Dong · 13 years ago
  62. 456caf3 resolved conflicts for merge of 07bacabe to master by Andreas Huber · 13 years ago
  63. 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
  64. a0f2bf5 Properly identify how much metadata we need to cache in order to instantiate by Andreas Huber · 13 years ago
  65. 162b40b audioflinger: fix audio skipping over A2DP by Eric Laurent · 13 years ago
  66. 2158db0 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  67. 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
  68. 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
  69. 36126b2 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  70. fa845c6 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
  71. 7570af1 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
  72. fed8bb6 MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE by Mike Lockwood · 13 years ago
  73. 8af4c7d MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE by Mike Lockwood · 13 years ago
  74. 651d4c6 Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage" by Mike Lockwood · 13 years ago
  75. f963220 Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" by Mike Lockwood · 13 years ago
  76. a9a46c1 MTP: Add support for restricting PTP to only certain subdirectories of the storage by Mike Lockwood · 13 years ago
  77. 48bd916 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  78. 42fb390 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  79. 44c1908 MTP: Don't attempt to read more than 16K at a time from the MTP driver by Mike Lockwood · 13 years ago
  80. 17078d8 am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 by Andreas Huber · 13 years ago
  81. 1d26d11 am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 by Andreas Huber · 13 years ago
  82. 4fe1c6c Fixes a typo in AVIExtractor that would advertise the wrong video dimensions by Andreas Huber · 13 years ago
  83. 2c0dd96 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  84. cd9e929 am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 13 years ago
  85. ea9d51b resolved conflicts for merge of 3d630e86 to master by Andreas Huber · 13 years ago
  86. 2907dac merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  87. 37a153f Merge "Add camera focus move callback." by Wu-cheng Li · 13 years ago
  88. 7a3a2b2 Fix the broken build by James Dong · 13 years ago
  89. 1503185 am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 13 years ago
  90. 21befea Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 13 years ago
  91. 8afbf8e am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 13 years ago
  92. c089d02 am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 13 years ago
  93. eca36b5 resolved conflicts for merge of 998a929a to master by Andreas Huber · 13 years ago
  94. 8a1fac3 am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1 by Andreas Huber · 13 years ago
  95. b96d3c5 am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 13 years ago
  96. 6bf045c am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 13 years ago
  97. b19386f am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1 by Andreas Huber · 13 years ago
  98. 7609b23 Merge "Make sure we can properly shutdown even if" into ics-mr1 by Andreas Huber · 13 years ago
  99. 5274010 Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 13 years ago
  100. 544ee28 Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 13 years ago