1. 6c72c18 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  2. 6f02c17 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  3. 98be7e0 camera2/3: Fix deadlock take picture while preview callback by Zhijun He · 12 years ago
  4. 574ca4f am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev by Zhijun He · 12 years ago
  5. ba696bb Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev by Zhijun He · 12 years ago
  6. d3a5b48 am 18b46679: Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev by Eric Laurent · 12 years ago
  7. 18b4667 Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev by Eric Laurent · 12 years ago
  8. 1c540f7 am 911a184b: am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track" by Glenn Kasten · 12 years ago
  9. 911a184 am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track" by Glenn Kasten · 12 years ago
  10. 132bc5b Merge "Noise will be heard if audio sample rate not matched with audio track" by Glenn Kasten · 12 years ago
  11. da5b509 Noise will be heard if audio sample rate not matched with audio track by Ming Zhou · 12 years ago
  12. 7e1139c AudioFlinger: do not cache audio device when 0. by Eric Laurent · 12 years ago
  13. ddb104d camera2/3: Fix deadlock take picture while preview callback by Zhijun He · 12 years ago
  14. e10dc92 camera3: Fix crash in set error state. by Zhijun He · 12 years ago
  15. 08419c3 camera2/3: Add protection to callback processing call by Zhijun He · 12 years ago
  16. e097efd am b05eeaed: camera3: Fix crash in set error state. by Zhijun He · 12 years ago
  17. b05eeae camera3: Fix crash in set error state. by Zhijun He · 12 years ago
  18. 1d263b8 am 62a8f67f: camera2/3: Add protection to callback processing call by Zhijun He · 12 years ago
  19. 62a8f67 camera2/3: Add protection to callback processing call by Zhijun He · 12 years ago
  20. 25c8c52 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  21. 1f8600a merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  22. 5c192e5 Camera2/3: Move recording frame processing to its own thread. by Eino-Ville Talvala · 12 years ago
  23. fb86ab8 stagefright: Fix port-reconfiguration & output-buffer-filled race condition by Lajos Molnar · 12 years ago
  24. 4dd110a am 254446a8: Camera2/3: Move recording frame processing to its own thread. by Eino-Ville Talvala · 12 years ago
  25. 1defb34 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  26. 254446a Camera2/3: Move recording frame processing to its own thread. by Eino-Ville Talvala · 12 years ago
  27. 0e754b8 Camera2/3: Don't trigger AF when in INFINITY focus mode. by Eino-Ville Talvala · 12 years ago
  28. cbbd6c8 am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  29. 8f908c0 Merge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  30. 9454a97 Camera2/3: Don't trigger AF when in INFINITY focus mode. by Eino-Ville Talvala · 12 years ago
  31. e64d413 am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev by Lajos Molnar · 12 years ago
  32. 25b5617 Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev by Lajos Molnar · 12 years ago
  33. f9bb835 am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright. by Andreas Huber · 12 years ago
  34. b7319a7 Update HTTP proxy configuration for all media playback inside stagefright. by Andreas Huber · 12 years ago
  35. e532d37 stagefright: Fix port-reconfiguration & output-buffer-filled race condition by Lajos Molnar · 12 years ago
  36. 268f5cc Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  37. fb5cee1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  38. 1cd6852 am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  39. 41688da Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  40. 197d3e0 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  41. 8617908 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  42. 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
  43. 3c89a2e Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev by Igor Murashkin · 12 years ago
  44. 6f505a4 MediaMuxer: Remove SAMPLE_FLAG_SYNC flag by Lajos Molnar · 12 years ago
  45. e2172be camera3: Don't try to disconnect stream native windows more than once by Igor Murashkin · 12 years ago
  46. 30ca800 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  47. 1352352 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  48. dd6b47e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  49. b4a0680 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  50. 22a5ddb am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  51. 6f6b31d Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  52. 14e585c am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  53. f8f370b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  54. 6947f12 Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  55. b662e33 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  56. 059161b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  57. 9b89c15 am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  58. ca3fb12 Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  59. 124ccf4 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  60. 98730cd am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  61. 1f7f83b Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  62. a842a2a Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  63. fead4f1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  64. efb0fd2 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  65. b7337d5 am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  66. ed49d7b Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  67. 1d60db8 am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  68. c2c874d Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  69. 82db9e6 camera3: Fix recording failure when switching resolutions while preview on by Igor Murashkin · 12 years ago
  70. 4345d5b Camera3: Make sure new metadata results signal other threads waiting by Igor Murashkin · 12 years ago
  71. cf2148e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  72. f3bddaf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  73. 5bbca46 Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  74. 9545b67 am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  75. f21daf4 Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  76. 722e489 am 01831d23: Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  77. 1b4ca5c Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  78. 01831d2 Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  79. d763063 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  80. a01f72d merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  81. 81972da Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  82. 074eb38 am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  83. e2dfa5a Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  84. b07d3c4 am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  85. 4224ded Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  86. d764424 update to Fence::waitForever() API change by Mathias Agopian · 12 years ago
  87. b5b2d03 am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 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. affd710 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  93. c3e155a Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp by Conley Owens · 12 years ago
  94. dd90e8b Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev by Conley Owens · 12 years ago
  95. eef0aa7 am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  96. 0d0d868 Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  97. 9f51d98 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  98. 03b7bdd am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev by Chong Zhang · 12 years ago
  99. ceac5fb Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev by Chong Zhang · 12 years ago
  100. a1f70e6 am 083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds by Igor Murashkin · 12 years ago