1. a40cc47 Merge "libstagefright: Check for duration > 0 to avoid divide-by-zero exception" by Vineeta Srivastava · 12 years ago
  2. fe7e0c6 camera: Dont segfault when result lacks timestamp by Alex Ray · 12 years ago
  3. 20cb300 camera3: Error on minimum buffer count by Alex Ray · 12 years ago
  4. c3a73bb am 1cd68527: am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  5. 1cd6852 am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  6. 41688da Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  7. b07198a Merge "Don't crash if no timescale was given" by Marco Nelissen · 12 years ago
  8. b3227fe Merge "Camera: static parameter default values" by Alex Ray · 12 years ago
  9. f4a9ce3 Merge "libcameraservice: missing argument when logging" by Alex Ray · 12 years ago
  10. 210efd48 Don't crash if no timescale was given by Marco Nelissen · 12 years ago
  11. 4d2dd55 am 197d3e07: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  12. 197d3e0 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  13. 8617908 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  14. 211a2ed Camera: static parameter default values by Alex Ray · 12 years ago
  15. 608cff2 libcameraservice: missing argument when logging by Alex Ray · 12 years ago
  16. 776a002 libstagefright: Check for duration > 0 to avoid divide-by-zero exception by Ajay Dudani · 12 years ago
  17. 8bae43a am 9f013a46: am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev by Igor Murashkin · 12 years ago
  18. 9f013a4 am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev by Igor Murashkin · 12 years ago
  19. 3c89a2e Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev by Igor Murashkin · 12 years ago
  20. 6f505a4 MediaMuxer: Remove SAMPLE_FLAG_SYNC flag by Lajos Molnar · 12 years ago
  21. e2172be camera3: Don't try to disconnect stream native windows more than once by Igor Murashkin · 12 years ago
  22. 88a0aba am 30ca8004: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  23. 30ca800 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  24. 1352352 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  25. 355daed am dd6b47e6: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  26. dd6b47e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  27. 55beec7 am 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  28. 4032fc3 am 14e585c8: am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  29. b4a0680 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  30. 22a5ddb am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  31. 6f6b31d Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  32. 14e585c am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  33. f8f370b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  34. 6947f12 Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  35. b662e33 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  36. 059161b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  37. 1f02e27 Merge "Add support for MPEG editlist gapless info" by Marco Nelissen · 12 years ago
  38. 0a69bd2 Add support for MPEG editlist gapless info by Marco Nelissen · 12 years ago
  39. d030447 stagefright: BufferProducer updates by Lajos Molnar · 12 years ago
  40. 599d83e am 9b89c15d: am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  41. 9b89c15 am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  42. ca3fb12 Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  43. 124ccf4 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  44. 7d7bb97 am 98730cd7: am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  45. 98730cd am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  46. 1f7f83b Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  47. aa754c8 am a842a2a6: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  48. a842a2a Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  49. fead4f1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  50. efb0fd2 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  51. a02eae5 stagefright: SoftVP8: Handle EOS flag on frames with content. by Lajos Molnar · 12 years ago
  52. c772245 am b7337d56: am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  53. b7337d5 am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  54. ed49d7b Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  55. 65e218e am 1d60db8b: am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  56. 1d60db8 am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  57. c2c874d Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  58. 82db9e6 camera3: Fix recording failure when switching resolutions while preview on by Igor Murashkin · 12 years ago
  59. 4345d5b Camera3: Make sure new metadata results signal other threads waiting by Igor Murashkin · 12 years ago
  60. b352cec am cf2148e8: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  61. cf2148e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  62. f3bddaf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  63. 5bbca46 Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  64. 6077b51 am 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  65. 9545b67 am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  66. f21daf4 Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  67. 475173c am 722e4892: am 01831d23: Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  68. 722e489 am 01831d23: Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  69. 1b4ca5c Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  70. 61d404e Update to supply correct name for new power manager app ops. by Dianne Hackborn · 12 years ago
  71. 01831d2 Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  72. 2a00d1f am d7630634: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  73. d763063 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  74. a01f72d merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  75. 308bcaa wifi-display: add support for metadata mode on encoder output by Chong Zhang · 12 years ago
  76. 6d10132 am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  77. 81972da Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  78. bd398c6 am 074eb387: am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  79. 074eb38 am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  80. e2dfa5a Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  81. 586e14c am b07d3c48: am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  82. b07d3c4 am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  83. 4224ded Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  84. d764424 update to Fence::waitForever() API change by Mathias Agopian · 12 years ago
  85. d392f21 am b5b2d03f: am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  86. b5b2d03 am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  87. 3135ab6 am a7f316e8: Reconcile with AOSP by Jean-Baptiste Queru · 12 years ago
  88. a7f316e Reconcile with AOSP by Jean-Baptiste Queru · 12 years ago
  89. 324143b Adjust timestamp scale by Andy McFadden · 12 years ago
  90. 99f27cd wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  91. eaf4216 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  92. f528b68 am affd710b: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  93. affd710 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  94. db1b090 Merge branch 'jb-mr2-dev-plus-aosp' by Conley Owens · 12 years ago
  95. c3e155a Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp by Conley Owens · 12 years ago
  96. dd90e8b Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev by Conley Owens · 12 years ago
  97. 3551dfe am dfaccc77: am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  98. eef0aa7 am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  99. dfaccc7 am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  100. 0d0d868 Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago