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