1. 22ce710 am da013597: am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev by Glenn Kasten · 11 years ago
  2. 63d7395 am e3cf96cc: am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev by Glenn Kasten · 11 years ago
  3. da01359 am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev by Glenn Kasten · 11 years ago
  4. e3cf96c am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev by Glenn Kasten · 11 years ago
  5. 1de65a9 Merge "Fix error message to match CTS" into jb-mr2-dev by Glenn Kasten · 11 years ago
  6. dbe6035 Merge "Use correct pid when running under test harness" into jb-mr2-dev by Glenn Kasten · 11 years ago
  7. ac08180 am 5bb603c1: am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev by Andreas Huber · 11 years ago
  8. 5bb603c am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev by Andreas Huber · 11 years ago
  9. 2c157e0 Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev by Andreas Huber · 11 years ago
  10. 4a6e78a am c2e8f144: am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev by Marco Nelissen · 11 years ago
  11. c2e8f14 am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev by Marco Nelissen · 11 years ago
  12. da77cee Merge "Fix sample info parsing" into jb-mr2-dev by Marco Nelissen · 11 years ago
  13. 5299272 am 2ffc2b8e: am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging by Jamie Gennis · 11 years ago
  14. 2ffc2b8 am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging by Jamie Gennis · 11 years ago
  15. 5ffabf0 OMXNodeInstance: actually fix OMX_GetExtIndex logging by Jamie Gennis · 11 years ago
  16. 949a926 Use correct pid when running under test harness by Glenn Kasten · 11 years ago
  17. 5051b53 Merge "Camera: Add preview callback surface support" by Eino-Ville Talvala · 11 years ago
  18. 5ea77ae Fix error message to match CTS by Glenn Kasten · 11 years ago
  19. 03ddaec Make sure MediaCodec::stop() and MediaCodec::release() still return by Andreas Huber · 11 years ago
  20. 48186b6 Fix sample info parsing by Marco Nelissen · 11 years ago
  21. 96c9b6e am 4d9df49a: am 64595e67: Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev by Jeff Tinker · 11 years ago
  22. 4d9df49 am 64595e67: Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev by Jeff Tinker · 11 years ago
  23. 64595e6 Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev by Jeff Tinker · 11 years ago
  24. 503261c am 4707c9b0: am f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev by Marco Nelissen · 11 years ago
  25. 8160921 am c9e18491: am 767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev by Andreas Huber · 11 years ago
  26. 45ae3d6 Add new error codes for DRM to improve error reporting by Jeff Tinker · 11 years ago
  27. 4707c9b am f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev by Marco Nelissen · 11 years ago
  28. c9e1849 am 767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev by Andreas Huber · 11 years ago
  29. f7baffd Merge "Make sure the drain buffer is big enough" into jb-mr2-dev by Marco Nelissen · 11 years ago
  30. 767fea9 Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev by Andreas Huber · 11 years ago
  31. 3ee3550 Camera: Add preview callback surface support by Eino-Ville Talvala · 11 years ago
  32. c7e45e2 am 38e28e87: am 8dd719e4: Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev by Andreas Huber · 11 years ago
  33. bbf898c am 7aebfe0e: am ed863845: Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev by Andreas Huber · 11 years ago
  34. 38e28e8 am 8dd719e4: Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev by Andreas Huber · 11 years ago
  35. 7aebfe0 am ed863845: Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev by Andreas Huber · 11 years ago
  36. 8dd719e Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev by Andreas Huber · 11 years ago
  37. ed86384 Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev by Andreas Huber · 11 years ago
  38. 42392e4 Apparently the mp3 decoder glitches if it was configured with the wrong by Andreas Huber · 11 years ago
  39. 7a3cb89 am 65e0123c: am 9e0727ca: Merge "Added CTS test for secure stop APIs" into jb-mr2-dev by Jeff Tinker · 11 years ago
  40. 65e0123 am 9e0727ca: Merge "Added CTS test for secure stop APIs" into jb-mr2-dev by Jeff Tinker · 11 years ago
  41. 9e0727c Merge "Added CTS test for secure stop APIs" into jb-mr2-dev by Jeff Tinker · 11 years ago
  42. 423e33c Added CTS test for secure stop APIs by Jeff Tinker · 11 years ago
  43. e42f027 Make sure the drain buffer is big enough by Marco Nelissen · 11 years ago
  44. da9740e Fix a typo that would cause us not to shutdown/flush the decoders in by Andreas Huber · 11 years ago
  45. edfa5ed am 9ac6ff1d: am 480721ea: Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  46. 9ac6ff1 am 480721ea: Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  47. 480721e Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  48. 1e0757e Parse the last none-empty line of .m3u8 file by Sungsoo Lim · 12 years ago
  49. 661ddb9 am 212c97d1: am f5c02110: Merge "Guard against mLooper == NULL." into jb-mr2-dev by Andreas Huber · 11 years ago
  50. 212c97d am f5c02110: Merge "Guard against mLooper == NULL." into jb-mr2-dev by Andreas Huber · 11 years ago
  51. f5c0211 Merge "Guard against mLooper == NULL." into jb-mr2-dev by Andreas Huber · 11 years ago
  52. 956d23d am 844c8b03: am ff4b1e2b: Merge "Better default AAC DRC setting" into jb-mr2-dev by Jean-Michel Trivi · 11 years ago
  53. 844c8b0 am ff4b1e2b: Merge "Better default AAC DRC setting" into jb-mr2-dev by Jean-Michel Trivi · 11 years ago
  54. ff4b1e2 Merge "Better default AAC DRC setting" into jb-mr2-dev by Jean-Michel Trivi · 11 years ago
  55. 4cb26d5 am 589bee39: am 94b66227: Fix Vorbis decoder reset by Marco Nelissen · 11 years ago
  56. 589bee3 am 94b66227: Fix Vorbis decoder reset by Marco Nelissen · 11 years ago
  57. 0e03e72 Better default AAC DRC setting by Jean-Michel Trivi · 11 years ago
  58. 94b6622 Fix Vorbis decoder reset by Marco Nelissen · 11 years ago
  59. a68e7b9 Guard against mLooper == NULL. by Andreas Huber · 11 years ago
  60. 5513704 Camera3: Allow multiple process_capture_result calls per request by Eino-Ville Talvala · 11 years ago
  61. 3b72d24 am f749a670: am f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev by Marco Nelissen · 11 years ago
  62. f749a67 am f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev by Marco Nelissen · 11 years ago
  63. f4c873a Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev by Marco Nelissen · 11 years ago
  64. abe7e0a am a5a827ca: am 5182337f: Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev by Glenn Kasten · 11 years ago
  65. a5a827c am 5182337f: Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev by Glenn Kasten · 11 years ago
  66. 5182337 Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev by Glenn Kasten · 11 years ago
  67. 7c5abbb Fix AAC decoder reconfiguration by Marco Nelissen · 11 years ago
  68. ea29f0d am a768b4f8: am 8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev by ztenghui · 11 years ago
  69. a768b4f am 8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev by ztenghui · 11 years ago
  70. 8f1efee Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev by ztenghui · 11 years ago
  71. d72ec85 am da69f1c2: Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  72. de05c8e MediaMuxer prefer not to use the MPEG4Writer in real time recording mode. by ztenghui · 11 years ago
  73. da69f1c Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  74. 0011777 am 2dd69cfc: am 5ce9c299: Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev by Andreas Huber · 11 years ago
  75. 2dd69cf am 5ce9c299: Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev by Andreas Huber · 11 years ago
  76. 5ce9c29 Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev by Andreas Huber · 11 years ago
  77. eadd1cf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  78. a191eb5 am 45ec469f: am 7455393a: Merge "Update the test output path." into jb-mr2-dev by Yu Shan Emily Lau · 11 years ago
  79. 45ec469 am 7455393a: Merge "Update the test output path." into jb-mr2-dev by Yu Shan Emily Lau · 11 years ago
  80. 7455393 Merge "Update the test output path." into jb-mr2-dev by Yu Shan Emily Lau · 11 years ago
  81. 41f37e7 Update the test output path. by Yu Shan Emily Lau · 11 years ago
  82. e982ae2 am 1d9c4125: am 4a4256eb: Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev by Jamie Gennis · 11 years ago
  83. 1d9c412 am 4a4256eb: Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev by Jamie Gennis · 11 years ago
  84. 4a4256e Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev by Jamie Gennis · 11 years ago
  85. e6e7ea4 am fe028e58: am 089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev by Marco Nelissen · 11 years ago
  86. 3f0651d am 4b40f7ef: am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev by Andreas Huber · 11 years ago
  87. fe028e5 am 089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev by Marco Nelissen · 11 years ago
  88. 089edf2 Merge "Fix MediaCodec.flush()" into jb-mr2-dev by Marco Nelissen · 11 years ago
  89. 4713d3d resolved conflicts for merge of 1e04c248 to master by Andreas Huber · 11 years ago
  90. f3bd197 Fix MediaCodec.flush() by Marco Nelissen · 11 years ago
  91. 4b40f7e am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev by Andreas Huber · 11 years ago
  92. 1e04c24 am c120d033: Merge "The framework really doesn\'t need to know the specifics of the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  93. 5157b1e Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev by Andreas Huber · 11 years ago
  94. c120d03 Merge "The framework really doesn't need to know the specifics of the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  95. 9a62391 Workaround: requestPriority() is one-way by Glenn Kasten · 11 years ago
  96. 2e05ce2 am 3958caaf: am cb42f317: Merge "Camera3: Improve error logging" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  97. 3958caa am cb42f317: Merge "Camera3: Improve error logging" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  98. cb42f31 Merge "Camera3: Improve error logging" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  99. ac0230d ACodec now signals an error if the mediaserver died while it is in by Andreas Huber · 11 years ago
  100. 76ab6df The framework really doesn't need to know the specifics of the codec by Andreas Huber · 11 years ago