1. a4a1c16 am 30e5fecf: am 848621d5: Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev by Andreas Huber · 11 years ago
  2. 5005a7c am 0a2d8961: am 0fb6aabf: Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev by Eric Laurent · 11 years ago
  3. fb2419b merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  4. 512382e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  5. 30e5fec am 848621d5: Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev by Andreas Huber · 11 years ago
  6. 0a2d896 am 0fb6aabf: Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev by Eric Laurent · 11 years ago
  7. 4c63a23 MediaDrm API update by Jeff Tinker · 11 years ago
  8. 848621d Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev by Andreas Huber · 11 years ago
  9. 9975940 Fix seek in response to OnPrepared() for HLS content by Andreas Huber · 11 years ago
  10. 0fb6aab Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev by Eric Laurent · 11 years ago
  11. cc3de1f am 8a212e39: am ec24fa46: MTP: Implement date created field in GetObjectInfo by Mike Lockwood · 11 years ago
  12. 8a212e3 am ec24fa46: MTP: Implement date created field in GetObjectInfo by Mike Lockwood · 11 years ago
  13. ec24fa4 MTP: Implement date created field in GetObjectInfo by Mike Lockwood · 11 years ago
  14. dd9a0e5 am fc67784b: am f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev by Lajos Molnar · 11 years ago
  15. fc67784 am f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev by Lajos Molnar · 11 years ago
  16. f923008 Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev by Lajos Molnar · 11 years ago
  17. a7a7562 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  18. 9eee211 am 1c93bb95: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  19. 1c93bb9 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  20. 0eb53b6 am 6da2afa9: am 31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev by Andreas Huber · 11 years ago
  21. 6da2afa am 31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev by Andreas Huber · 11 years ago
  22. 31215f2 Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev by Andreas Huber · 11 years ago
  23. ff9297a Fix SHUTDOWN after SETUP and before PLAY in wifi display. by Andreas Huber · 11 years ago
  24. a8eccec ToneGenerator: fix overflow in stopTone by Eric Laurent · 11 years ago
  25. 8bca3d4 am 945957de: am d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  26. 945957d am d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  27. d0b1fac Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  28. d477b8d Make sure resume() and flush() are handled appropriately even if the codec by Andreas Huber · 11 years ago
  29. a8dd8ef am 49a8b409: am 5952255a: Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev by Marco Nelissen · 11 years ago
  30. 49a8b40 am 5952255a: Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev by Marco Nelissen · 11 years ago
  31. 5952255 Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev by Marco Nelissen · 11 years ago
  32. 2d0a2f5 am 425340a1: am 636a5bd6: Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  33. 425340a am 636a5bd6: Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  34. 509f456 am 790b6755: am 3a1d8b51: Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  35. 7dc726b am 2854dc14: am 8fc405ff: Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  36. 790b675 am 3a1d8b51: Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  37. 2854dc1 am 8fc405ff: Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  38. 636a5bd Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  39. 3a1d8b5 Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  40. 8fc405f Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  41. 8006237 am 1087886b: am d6a6bf3f: Merge "Fix valgrind error." into jb-mr2-dev by Marco Nelissen · 11 years ago
  42. 1087886 am d6a6bf3f: Merge "Fix valgrind error." into jb-mr2-dev by Marco Nelissen · 11 years ago
  43. d6a6bf3 Merge "Fix valgrind error." into jb-mr2-dev by Marco Nelissen · 11 years ago
  44. fc4f5ea merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  45. e467ef0 stagefright: matroska: don't crash on parsing error by Lajos Molnar · 11 years ago
  46. 08b7c1e am 2a2f0ece: am 681be039: ToneGenerator: fix truncated tones by Eric Laurent · 11 years ago
  47. 2a2f0ec am 681be039: ToneGenerator: fix truncated tones by Eric Laurent · 11 years ago
  48. 681be03 ToneGenerator: fix truncated tones by Eric Laurent · 11 years ago
  49. 16ba880 am 7ffe7689: am 2d595c0e: Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev by Eric Laurent · 11 years ago
  50. 7ffe768 am 2d595c0e: Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev by Eric Laurent · 11 years ago
  51. 2d595c0 Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev by Eric Laurent · 11 years ago
  52. d0158c3 Camera: Add output side to camera3 HAL device by Eino-Ville Talvala · 11 years ago
  53. 3b53bc9 Camera: Add input side to camera3 HAL device by Eino-Ville Talvala · 11 years ago
  54. 8be20f5 Camera: Add streams to camera3 HAL device by Eino-Ville Talvala · 11 years ago
  55. 4a7fe9c Fix valgrind error in software h264 decoder by Marco Nelissen · 11 years ago
  56. 2260fc0 am 2ec46421: am ad065d38: Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev by Igor Murashkin · 11 years ago
  57. 2ec4642 am ad065d38: Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev by Igor Murashkin · 11 years ago
  58. ad065d3 Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev by Igor Murashkin · 11 years ago
  59. 59ca804 Fix valgrind error. by Marco Nelissen · 11 years ago
  60. f3d8ee2 am 5683ded7: am bdeaccfd: Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev by Igor Murashkin · 11 years ago
  61. 5683ded am bdeaccfd: Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev by Igor Murashkin · 11 years ago
  62. bdeaccf Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev by Igor Murashkin · 11 years ago
  63. 65d7986 ProCamera: Fix memory leak in consumeFrameMetadata by Igor Murashkin · 11 years ago
  64. 9846124 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  65. cba2c16 Camera: Add hotplug support (for fixed # of cameras) by Igor Murashkin · 11 years ago
  66. 09108ad ToneGenerator: fix stop/destroy concurrency by Eric Laurent · 11 years ago
  67. f9ec9a9 am 69aaa847: am 4b6ed7f2: Merge "media.log dump" into jb-mr2-dev by Glenn Kasten · 11 years ago
  68. 69aaa84 am 4b6ed7f2: Merge "media.log dump" into jb-mr2-dev by Glenn Kasten · 11 years ago
  69. 4b6ed7f Merge "media.log dump" into jb-mr2-dev by Glenn Kasten · 11 years ago
  70. bc51207 media.log dump by Glenn Kasten · 11 years ago
  71. e89c0c1 am a66ca01a: am 4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev by Andreas Huber · 11 years ago
  72. a66ca01 am 4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev by Andreas Huber · 11 years ago
  73. 4fc3e84 Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev by Andreas Huber · 11 years ago
  74. eaf5381 Adapt frame rate instead of keeping that constant and tweaking bitrate by Andreas Huber · 11 years ago
  75. ee12031 am 44ae449b: am 6386b50b: ToneGenerator: fix AudioTrack pointer init by Eric Laurent · 11 years ago
  76. 44ae449 am 6386b50b: ToneGenerator: fix AudioTrack pointer init by Eric Laurent · 11 years ago
  77. 6386b50 ToneGenerator: fix AudioTrack pointer init by Eric Laurent · 11 years ago
  78. 5a2e8ce am d1116957: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  79. d111695 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  80. c2140bb am 1e7d497c: am cd77d4a1: Identify network servers and clients with a OS version related string by Andreas Huber · 11 years ago
  81. 1e7d497 am cd77d4a1: Identify network servers and clients with a OS version related string by Andreas Huber · 11 years ago
  82. cd77d4a Identify network servers and clients with a OS version related string by Andreas Huber · 11 years ago
  83. 5742afb am cb7e64f4: am 5d014f0f: Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev by Andreas Huber · 11 years ago
  84. cb7e64f am 5d014f0f: Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev by Andreas Huber · 11 years ago
  85. 5d014f0 Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev by Andreas Huber · 11 years ago
  86. c2f6501 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  87. 5787070 am ead8ae2a: am 19c11e1c: Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev by Eric Laurent · 11 years ago
  88. ead8ae2 am 19c11e1c: Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev by Eric Laurent · 11 years ago
  89. 19c11e1 Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev by Eric Laurent · 11 years ago
  90. 2aea955 In "special" mode we now establish a UDP RTCP channel in addition to the by Andreas Huber · 11 years ago
  91. 4d81807 am 6436281a: am 112c72a9: Merge "Get rid of TunnelRenderer" into jb-mr2-dev by Andreas Huber · 11 years ago
  92. 6436281 am 112c72a9: Merge "Get rid of TunnelRenderer" into jb-mr2-dev by Andreas Huber · 11 years ago
  93. 112c72a Merge "Get rid of TunnelRenderer" into jb-mr2-dev by Andreas Huber · 11 years ago
  94. 6eb954f ToneGenerator: optimize silent tone by Eric Laurent · 11 years ago
  95. f90debb Get rid of TunnelRenderer by Andreas Huber · 11 years ago
  96. 1922d9b am 0b56fc9c: am bd91c0ab: Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev by Andreas Huber · 11 years ago
  97. 0b56fc9 am bd91c0ab: Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev by Andreas Huber · 11 years ago
  98. bd91c0a Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev by Andreas Huber · 11 years ago
  99. cc8623a Misc debugging support and handling of latency changes. by Andreas Huber · 11 years ago
  100. 793cc53 am d247aa8c: am 351f28e2: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev by Jeff Tinker · 11 years ago